[Freeswitch-svn] [commit] r11715 - freeswitch/branches/gmaruzz/mod_skypiax

[FreeSWITCH SVN]

Author: gmaruzz
Date: Mon Feb  9 12:26:31 2009
New Revision: 11715

Log:
skypiax: skypiax_protocol.c indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90 

Modified:
   freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c

Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c
==============================================================================
--- freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c	(original)
+++ freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c	Mon Feb  9 12:26:31 2009
@@ -352,8 +352,7 @@
 
           DEBUGA_SKYPE("READING: |||%s||| \n", SKYPIAX_P_LOG, message);
 
-          if (!strcasecmp(message, "ERROR 68")) { /* not yet protocol specified,
-                                                       just authorized */
+          if (!strcasecmp(message, "ERROR 68")) { 
             DEBUGA_SKYPE
               ("If I don't connect immediately, please give the Skype client authorization to be connected by Skypiax (and to not ask you again)\n",
                SKYPIAX_P_LOG);
@@ -386,25 +385,6 @@
           if (!where) {
             WARNINGA("Skype MSG without spaces: %s\n", SKYPIAX_P_LOG, message);
           }
-
-          if (!strcasecmp(message, "#333")) {
-            /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[11]: %s\n", SKYPIAX_P_LOG,
-             * message_2, &message_2[11]); */
-            memset(tech_pvt->skype_friends, 0, 4096);
-            strncpy(tech_pvt->skype_friends, &message_2[11], 4095);
-          }
-          if (!strcasecmp(message, "#222")) {
-            /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG,
-             * message_2, &message_2[10]); */
-            memset(tech_pvt->skype_fullname, 0, 512);
-            strncpy(tech_pvt->skype_fullname, &message_2[10], 511);
-          }
-          if (!strcasecmp(message, "#765")) {
-            /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG,
-             * message_2, &message_2[10]); */
-            memset(tech_pvt->skype_displayname, 0, 512);
-            strncpy(tech_pvt->skype_displayname, &message_2[10], 511);
-          }
           if (!strcasecmp(message, "ERROR")) {
             ERRORA("Skype got ERROR: |||%s|||\n", SKYPIAX_P_LOG, message);
             tech_pvt->skype_callflow = CALLFLOW_STATUS_FINISHED;
@@ -716,6 +696,26 @@
 
           }                     //CALL
 
+	  /* the "numbered" messages that follows are used by the directory application, not yet ported */
+          if (!strcasecmp(message, "#333")) {
+            /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[11]: %s\n", SKYPIAX_P_LOG,
+             * message_2, &message_2[11]); */
+            memset(tech_pvt->skype_friends, 0, 4096);
+            strncpy(tech_pvt->skype_friends, &message_2[11], 4095);
+          }
+          if (!strcasecmp(message, "#222")) {
+            /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG,
+             * message_2, &message_2[10]); */
+            memset(tech_pvt->skype_fullname, 0, 512);
+            strncpy(tech_pvt->skype_fullname, &message_2[10], 511);
+          }
+          if (!strcasecmp(message, "#765")) {
+            /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG,
+             * message_2, &message_2[10]); */
+            memset(tech_pvt->skype_displayname, 0, 512);
+            strncpy(tech_pvt->skype_displayname, &message_2[10], 511);
+          }
+
           a = 0;
         }                       //message end
       }                         //read_from_pipe