Changeset 5146:716400712348 in roaraudio for libroar/auth.c

Timestamp:

10/15/11 12:48:07 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Moved error frame handling into proto functions (pr0)

File:

• libroar/auth.c (modified) (11 diffs)

libroar/auth.c

@@ -135 +135 @@
  char                  * data = NULL;
 
+ ROAR_DBG("roar_auth_ask_server(con=%p, authmes=%p{.type=%i}) = ?", con, authmes, authmes->type);
+
+ roar_err_init(&error_frame);
  memset(&mes, 0, sizeof(struct roar_message)); // make valgrind happy!
 
@@ -162 +165 @@
  }
 
- if ( (ret = roar_req(con, &mes, &data)) == -1 ) {
+ ROAR_DBG("roar_auth_ask_server(con=%p, authmes=%p{.type=%i}) = ?", con, authmes, authmes->type);
+
+ if ( (ret = roar_req2(con, &mes, &data, &error_frame)) == -1 ) {
   authmes->type = -1;
-  return -1;
- }
+  ROAR_DBG("roar_auth_ask_server(con=%p, authmes=%p) = -1 // next: -1", con, authmes, authmes->type);
+  return -1;
+ }
+
+ ROAR_DBG("roar_auth_ask_server(con=%p, authmes=%p{.type=%i}): mes->cmd=%i", con, authmes, authmes->type, mes.cmd);
 
  if ( data != NULL ) {
@@ -173 +181 @@
  }
 
- if ( mes.cmd != ROAR_CMD_OK ) {
-  if ( data != NULL ) {
-   // we currently do not support long error frames.
-   free(data);
-   return -1;
-  }
-
+ if ( mes.cmd == ROAR_CMD_ERROR )
   ret = -1;
-  if ( roar_err_parsemsg(&mes, &error_frame) == -1 ) {
-   authmes->type = -1;
-   return -1;
-  }
-
+
+ ROAR_DBG("roar_auth_ask_server(con=%p, authmes=%p{.type=%i}): error_frame.data=%p",
+           con, authmes, authmes->type, error_frame.data);
+
+ if ( mes.cmd == ROAR_CMD_ERROR && error_frame.data != NULL ) {
   header = error_frame.data;
   mes.datalen = error_frame.datalen;
  }
+
+ ROAR_DBG("roar_auth_ask_server(con=%p, authmes=%p{.type=%i}) = ?", con, authmes, authmes->type);
 
  if ( mes.datalen < 4 ) {
@@ -197 +201 @@
  }
 
+ ROAR_DBG("roar_auth_ask_server(con=%p, authmes=%p) = ?", con, authmes);
+
  authmes->stage         = header[1];
  authmes->reserved.c[0] = header[2];
@@ -204 +210 @@
   free(data);
 
+ ROAR_DBG("roar_auth_ask_server(con=%p, authmes=%p) = %i // next: %i", con, authmes, ret, authmes->type);
  return ret;
 }
@@ -307 +314 @@
  for (i = 0; ltt[i] != _EOL; i++) {
   next = ltt[i];
+  ROAR_DBG("roar_auth(con=%p): next from ltt: %s(%i)", con, roar_autht2str(next), next);
+
   while (next != -1) {
    done = 1;
@@ -312 +321 @@
    cur  = next;
    next = -1;
+
+   ROAR_DBG("roar_auth(con=%p): cur=%s(%i)", con, roar_autht2str(cur), cur);
 
    switch (cur) {
@@ -322 +333 @@
     case ROAR_AUTH_T_RHOST:
     case ROAR_AUTH_T_NONE:
-      roar_auth_mes_init(&authmes, ltt[i]);
+      roar_auth_mes_init(&authmes, cur);
       if ( (ret = roar_auth_ask_server(con, &authmes)) == -1 )
        done = 0;
@@ -341 +352 @@
     done = 0;
 
-   if ( done )
+   ROAR_DBG("roar_auth(con=%p): done=%i, next=%i", con, done, next);
+
+   if ( done ) {
+    ROAR_DBG("roar_auth(con=%p) = 0", con);
     return 0;
+   }
   }
  }
 
+ ROAR_DBG("roar_auth(con=%p) = -1", con);
  return -1;
 }
@@ -354 +370 @@
  char header[4] = {0, 0, 0, 0};
 
- if ( ames == NULL || mes == NULL )
-  return -1;
+ if ( ames == NULL || mes == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  if ( data != NULL ) {
@@ -386 +404 @@
  char * obuf;
 
- if ( mes == NULL || ames == NULL )
-  return -1;
+ if ( mes == NULL || ames == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  if ( data != NULL )