Changeset 3228:ba545e1a7a77 in roaraudio

Timestamp:

01/24/10 08:45:51 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

try multible auth metodes if server does not accept us

File:

• libroar/auth.c (modified) (1 diff)

libroar/auth.c

@@ -166 +166 @@
 }
 
+#define _EOL ROAR_AUTH_T_AUTO
 int roar_auth   (struct roar_connection * con) {
  struct roar_auth_message authmes;
  int ret;
-
- roar_auth_mes_init(&authmes, ROAR_AUTH_T_NONE);
-
- if ( (ret = roar_auth_ask_server(con, &authmes)) == -1 )
-  return -1;
-
- if ( authmes.stage != 0 )
-  return -1;
-
- return 0;
+ int i;
+ int ltt[] = {
+              ROAR_AUTH_T_TRUST,
+              ROAR_AUTH_T_IDENT,
+              ROAR_AUTH_T_RHOST,
+              ROAR_AUTH_T_NONE,
+              _EOL
+             };
+
+ for (i = 0; ltt[i] != _EOL; i++) {
+  roar_auth_mes_init(&authmes, ltt[i]);
+
+  if ( (ret = roar_auth_ask_server(con, &authmes)) == -1 )
+   continue;
+
+  if ( authmes.stage != 0 )
+   continue;
+
+  return 0;
+ }
+
+ return -1;
 }