Changeset 5467:30f989510eb4 in roaraudio for libroar
- Timestamp:
- 03/31/12 04:19:09 (12 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libroar
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/basic.c
r5465 r5467 460 460 memset(con, 0, sizeof(struct roar_connection)); 461 461 con->refc = 1; 462 con->flags = ROAR_CON_FLAGS_ NONE;462 con->flags = ROAR_CON_FLAGS_ISCLIENT; 463 463 con->version = _ROAR_MESSAGE_VERSION; 464 464 con->cb_userdata = NULL; … … 655 655 } 656 656 657 int16_t roar_message_genseq(struct roar_connection * con, int is_client) { 658 static int16_t store = 0; 659 int16_t ret = 0; 660 661 ret = store++; 662 663 if ( is_client == -1 ) { 664 if ( con != NULL ) { 665 is_client = con->flags & ROAR_CON_FLAGS_ISCLIENT ? 1 : 0; 666 } 667 } 668 669 if ( is_client == -1 ) 670 is_client = 1; 671 672 ret |= 0x8000U; 673 if ( !is_client ) 674 ret -= 0x8000U; 675 676 return ret; 677 } 678 657 679 int roar_sync (struct roar_connection * con) { 658 680 // wait for any non-client reqs -
libroar/proto.c
r5465 r5467 231 231 } 232 232 mes->datalen = ROAR_NET2HOST16(*(uint16_t*)(bufptr+0)); 233 mes->seq = ROAR_NET2HOST16(*(uint16_t*)(bufptr+ 1));233 mes->seq = ROAR_NET2HOST16(*(uint16_t*)(bufptr+2)); 234 234 break; 235 235 } … … 321 321 mes->version = con->version; 322 322 323 if ( mes->version == 2 ) { 324 mes->seq = roar_message_genseq(con, -1); 325 } 326 323 327 return roar_vreq2(vio, mes, data, errorframe); 324 328 }
Note: See TracChangeset
for help on using the changeset viewer.