Changeset 5467:30f989510eb4 in roaraudio

Timestamp:

03/31/12 04:19:09 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make use of seq-numbers in v2 messages

Files:

• include/libroar/basic.h (modified) (1 diff)
• libroar/basic.c (modified) (2 diffs)
• libroar/proto.c (modified) (2 diffs)

include/libroar/basic.h

@@ -104 +104 @@
 int roar_set_connection_version(struct roar_connection * con, int version);
 
+int16_t roar_message_genseq(struct roar_connection * con, int is_client);
+
 int roar_sync         (struct roar_connection * con);
 int roar_wait_msg     (struct roar_connection * con, int16_t seq, int16_t seqmask);

libroar/basic.c

@@ -460 +460 @@
  memset(con, 0, sizeof(struct roar_connection));
  con->refc        = 1;
- con->flags       = ROAR_CON_FLAGS_NONE;
+ con->flags       = ROAR_CON_FLAGS_ISCLIENT;
  con->version     = _ROAR_MESSAGE_VERSION;
  con->cb_userdata = NULL;
@@ -655 +655 @@
 }
 
+int16_t roar_message_genseq(struct roar_connection * con, int is_client) {
+ static int16_t store = 0;
+ int16_t ret = 0;
+
+ ret = store++;
+
+ if ( is_client == -1 ) {
+  if ( con != NULL ) {
+   is_client = con->flags & ROAR_CON_FLAGS_ISCLIENT ? 1 : 0;
+  }
+ }
+
+ if ( is_client == -1 )
+  is_client = 1;
+
+ ret |= 0x8000U;
+ if ( !is_client )
+  ret -= 0x8000U;
+
+ return ret;
+}
+
 int roar_sync         (struct roar_connection * con) {
  // wait for any non-client reqs

libroar/proto.c

@@ -231 +231 @@
     }
     mes->datalen = ROAR_NET2HOST16(*(uint16_t*)(bufptr+0));
-    mes->seq     = ROAR_NET2HOST16(*(uint16_t*)(bufptr+1));
+    mes->seq     = ROAR_NET2HOST16(*(uint16_t*)(bufptr+2));
    break;
  }
@@ -321 +321 @@
   mes->version = con->version;
 
+ if ( mes->version == 2 ) {
+  mes->seq = roar_message_genseq(con, -1);
+ }
+
  return roar_vreq2(vio, mes, data, errorframe);
 }