Changeset 5465:d5e7bc292531 in roaraudio

Timestamp:

03/31/12 02:30:26 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

no longer use fixed protocol version (_ROAR_MESSAGE_VERSION=0).
protocol version is now used by setting in message object.
If using connection based req (roar_req()) it will use version from connection
object setting. The connection object get's a default from the config.
The config key is "protocolversion".
roard will answer in the same version as the request was send in.

Files:

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

include/libroar/basic.h

@@ -102 +102 @@
                                  void * userdata);
 
+int roar_set_connection_version(struct roar_connection * con, int version);
+
 int roar_sync         (struct roar_connection * con);
 int roar_wait_msg     (struct roar_connection * con, int16_t seq, int16_t seqmask);

include/libroar/config.h

@@ -130 +130 @@
  char * daemonimage;
  int serverflags;
+ int protocolversion;
 };
 

libroar/basic.c

@@ -451 +451 @@
 
 int roar_connect_none (struct roar_connection * con) {
+ struct roar_libroar_config * config = roar_libroar_get_config();
+
  if ( con == NULL ) {
   roar_err_set(ROAR_ERROR_INVAL);
@@ -459 +461 @@
  con->refc        = 1;
  con->flags       = ROAR_CON_FLAGS_NONE;
- con->version     = 0;
+ con->version     = _ROAR_MESSAGE_VERSION;
  con->cb_userdata = NULL;
  con->cb          = NULL;
@@ -470 +472 @@
 
 // con->flags |= ROAR_CON_FLAGS_VIO;
+
+ if ( config->protocolversion != -1 )
+  roar_set_connection_version(con, config->protocolversion);
 
  roar_err_set(ROAR_ERROR_NONE);
@@ -616 +621 @@
                                             void                   * userdata),
                                  void * userdata) {
- if ( con == NULL )
-  return -1;
+ if ( con == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  con->cb       = cb;
  con->cb_userdata = userdata;
+
+ return 0;
+}
+
+int roar_set_connection_version(struct roar_connection * con, int version) {
+ if ( con == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( version == -1 )
+  version = _ROAR_MESSAGE_VERSION;
+
+ if ( version < 0 ) {
+  roar_err_set(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ con->version = version;
+
+ if ( version == 2 ) {
+  con->flags |= ROAR_CON_FLAGS_SUPPORT_V2;
+ }
 
  return 0;

libroar/config.c

@@ -58 +58 @@
   config.connect_internal = NULL;
   config.daemonimage      = NULL;
+  config.protocolversion  = -1; // use default.
 
   if ( home != NULL ) {
@@ -319 +320 @@
     ROAR_WARN("roar_libroar_config_parse(*): Unknown serverflag: %s", v);
    }
+  } else if ( !strcmp(k, "protocolversion") ) {
+   config->protocolversion = atoi(v);
   } else {
    ROAR_WARN("roar_libroar_config_parse(*): Unknown option: %s", k);

libroar/proto.c

@@ -70 +70 @@
 
  headerlen = _ROAR_MESS_BUF_LEN;
-
- mes->version = _ROAR_MESSAGE_VERSION;
 
  buf[0] = mes->version; // first byte is always the version.
@@ -320 +318 @@
   return -1;
 
+ if ( mes->version == _ROAR_MESSAGE_VERSION )
+  mes->version = con->version;
+
  return roar_vreq2(vio, mes, data, errorframe);
 }