Changeset 6020:11e65673ee8c in roaraudio

Timestamp:

07/13/14 17:57:29 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

a little cleanup and some preparing for v1 CON_STREAM messages

File:

• roard/req.c (modified) (1 diff)

roard/req.c

@@ -457 +457 @@
  char   host[80] = {0};
  int    port = 0;
- int    type;
+ int    type = ROAR_SOCKET_TYPE_NONE;
  int    fh;
  int    len;
 
- if ( mes->datalen < 4 )
-  return -1;
-
- if ( *(mes->data) != 0 )
-  return -1;
-
- if ( mes->datalen > 80 ) // we do not support long messages here
-  return -1;
-
- type = (unsigned)mes->data[1];
- port = ROAR_NET2HOST16(((uint16_t*)mes->data)[1]);
-
- len = mes->datalen - 4;
-
- strncpy(host, &(mes->data[4]), len);
- host[len] = 0;
-
- if ( type > ROAR_SOCKET_TYPE_MAX )
-  return -1;
-
- if ( type == ROAR_SOCKET_TYPE_FILE ) // disabled because of security resons
-  return -1;
-
- if ( type == ROAR_SOCKET_TYPE_FORK ) // why should we connect to ourself?
-  return -1;
+ if ( mes->datalen < 4 ) {
+  roar_err_set(ROAR_ERROR_BADMSG);
+  return -1;
+ }
+
+ if ( mes->datalen > 80 ) { // we do not support long messages here
+  roar_err_set(ROAR_ERROR_MSGSIZE);
+  return -1;
+ }
+
+ switch (*(mes->data)) {
+  case 0: // version 0 packet:
+    type = (unsigned)mes->data[1];
+    port = ROAR_NET2HOST16(((uint16_t*)mes->data)[1]);
+
+    len = mes->datalen - 4;
+
+    strncpy(host, &(mes->data[4]), len);
+    host[len] = 0;
+   break;
+  default:
+    roar_err_set(ROAR_ERROR_NSVERSION);
+    return -1;
+   break;
+ }
+
+ if ( type > ROAR_SOCKET_TYPE_MAX ) {
+  roar_err_set(ROAR_ERROR_NOENT);
+  return -1;
+ }
+
+ switch (type) {
+  case ROAR_SOCKET_TYPE_NONE:
+  case ROAR_SOCKET_TYPE_FORK:
+  case ROAR_SOCKET_TYPE_GENSTR:
+    roar_err_set(ROAR_ERROR_INVAL);
+    return -1;
+   break;
+  case ROAR_SOCKET_TYPE_FILE:
+    roar_err_set(ROAR_ERROR_PERM);
+    return -1;
+   break;
+  default:
+    // pass.
+   break;
+ }
 
  ROAR_DBG("req_on_con_stream(*): CONNECT(type=%i, host='%s', port=%i)", type, host, port);