Changeset 4745:1e974ec321bd in roaraudio for roard

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Better auth type oder support (Closes: #6)

Location:

roard

Files:

• auth.c (modified) (3 diffs)
• include/auth.h (modified) (1 diff)
• req.c (modified) (2 diffs)

roard/auth.c

@@ -115 +115 @@
 }
 
-int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes) {
+int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes, int * next) {
  struct auth_key * key;
  int i;
  int ret;
 
- if ( cs == NULL || authmes == NULL )
-  return -1;
+ if ( cs == NULL || authmes == NULL || next == NULL )
+  return -1;
+
+ *next = -1;
 
  for (i = 0; i < AUTH_KEYRING_LEN; i++) {
@@ -150 +152 @@
       /* ignore this case and continue */
      break;
-    case 0:
+    case 0: // fatal auth error (server side auth cancel)
       return 0;
      break;
@@ -163 +165 @@
   }
  }
+
+ // make a better guess:
+/*
+ if ( authmes->type == ROAR_AUTH_T_PASSWORD ) {
+  *next = -1;
+ } else {
+  *next = ROAR_AUTH_T_PASSWORD;
+ }
+*/
 
  return -1;

roard/include/auth.h

@@ -72 +72 @@
 union auth_typeunion * auth_regkey_simple(int type, enum roard_client_acclev acclev);
 
-int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes);
-
+int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes, int * next);
 
 int auth_addkey_anonymous(enum roard_client_acclev acclev);

roard/req.c

@@ -100 +100 @@
 
 int req_on_auth        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
+ struct roar_error_frame   error_frame;
+ void                    * error_data;
+ struct roar_message       error_mes;
  struct roar_client_server * cs;
  struct roar_auth_message    authmes;
+ int next = -1;
  int ret;
 
@@ -114 +118 @@
                            client, roar_autht2str(authmes.type), authmes.type);
 
- ret = auth_client_ckeck(cs, &authmes);
-
- if ( ret != 1 )
-  return -1;
+ ret = auth_client_ckeck(cs, &authmes, &next);
+
+ if ( ret != 1 ) {
+  if ( next != -1 ) {
+   memset(&authmes, 0, sizeof(authmes));
+
+   authmes.type = next;
+
+   if ( roar_auth_to_mes(&error_mes, NULL, &authmes) == -1 )
+    return -1;
+
+   if ( roar_err_int(&error_frame) == -1 )
+    return -1;
+
+   error_frame.ra_errno = ROAR_ERROR_PERM;
+   error_frame.datalen  = error_mes.datalen;
+
+   error_data   = roar_err_buildmsg(mes, &error_frame);
+
+   memcpy(error_data, error_mes.data, error_mes.datalen);
+
+   mes->cmd     = ROAR_CMD_ERROR;
+   mes->pos     = g_pos;
+   return 0;
+  }
+
+  return -1;
+ }
 
  mes->cmd     = ROAR_CMD_OK;