Changeset 4745:1e974ec321bd in roaraudio for libroar/auth.c

Timestamp:

01/31/11 15:16:14 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Better auth type oder support (Closes: #6)

File:

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

libroar/auth.c

@@ -129 +129 @@
 
 static int roar_auth_ask_server (struct roar_connection * con, struct roar_auth_message * authmes) {
- struct roar_message   mes;
- char                * header = mes.data;
- int                   ret;
+ struct roar_error_frame error_frame;
+ struct roar_message     mes;
+ char                  * header = mes.data;
+ int                     ret;
 
  memset(&mes, 0, sizeof(struct roar_message)); // make valgrind happy!
@@ -143 +144 @@
  header[3] = authmes->reserved.c[1];
 
- if ( (ret = roar_req(con, &mes, NULL)) == -1 )
-  return -1;
-
- if ( mes.cmd != ROAR_CMD_OK )
-  return -1;
+ if ( (ret = roar_req(con, &mes, NULL)) == -1 ) {
+  authmes->type = -1;
+  return -1;
+ }
+
+ if ( mes.cmd != ROAR_CMD_OK ) {
+  ret = -1;
+  if ( roar_err_parsemsg(&mes, &error_frame) == -1 ) {
+   authmes->type = -1;
+   return -1;
+  }
+
+  header = error_frame.data;
+  mes.datalen = error_frame.datalen;
+ }
 
  if ( mes.datalen < 4 ) {
   memset(header+mes.datalen, 0, 4-mes.datalen);
- }
-
- authmes->type          = header[0];
+  authmes->type          = -1;
+ } else {
+  authmes->type          = header[0];
+ }
+
  authmes->stage         = header[1];
  authmes->reserved.c[0] = header[2];
  authmes->reserved.c[1] = header[3];
 
- return 0;
+ return ret;
 }
 
@@ -171 +184 @@
 
 
-static int try_password (struct roar_connection * con) {
+static int try_password (struct roar_connection * con, int * next) {
  struct roar_message mes;
  struct roar_auth_message authmes;
  char * pw;
+
+ // TODO: add support for *next.
 
  roar_auth_mes_init(&authmes, ROAR_AUTH_T_PASSWORD);
@@ -214 +229 @@
  int ret;
  int i;
+ int cur, next;
+ int done;
  int ltt[] = {
               ROAR_AUTH_T_TRUST,
@@ -224 +241 @@
 
  for (i = 0; ltt[i] != _EOL; i++) {
-  switch (ltt[i]) {
-    case ROAR_AUTH_T_PASSWORD:
-     if ( (ret = try_password(con)) == -1 )
-      continue;
+  next = ltt[i];
+  while (next != -1) {
+   done = 1;
+
+   cur  = next;
+   next = -1;
+
+   switch (cur) {
+     case ROAR_AUTH_T_PASSWORD:
+      if ( (ret = try_password(con, &next)) == -1 )
+       done = 0;
+      break;
+     case ROAR_AUTH_T_TRUST:
+     case ROAR_AUTH_T_IDENT:
+     case ROAR_AUTH_T_RHOST:
+     case ROAR_AUTH_T_NONE:
+      roar_auth_mes_init(&authmes, ltt[i]);
+      if ( (ret = roar_auth_ask_server(con, &authmes)) == -1 )
+       done = 0;
+
+      next = authmes.type;
      break;
-    case ROAR_AUTH_T_TRUST:
-    case ROAR_AUTH_T_IDENT:
-    case ROAR_AUTH_T_RHOST:
-    case ROAR_AUTH_T_NONE:
-     roar_auth_mes_init(&authmes, ltt[i]);
-     if ( (ret = roar_auth_ask_server(con, &authmes)) == -1 )
-      continue;
-    break;
-   default: /* Bad error! */
-     return -1;
-    break;
+    default: /* Bad error! */
+      return -1;
+     break;
+   }
+
+   if ( authmes.stage != 0 )
+    done = 0;
+
+   if ( done )
+    return 0;
   }
-
-  if ( authmes.stage != 0 )
-   continue;
-
-  return 0;
  }