Changeset 12f500f for protocols/skype/skype.c

Timestamp:

2013-02-21T13:16:26Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

06eef80

Parents:

e4f5ca8 (diff), 9754c2f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from vmiklos. Mostly Skype stuff and further deprecating a nogaim
function.

File:

• protocols/skype/skype.c (modified) (18 diffs)

protocols/skype/skype.c

@@ -29 +29 @@
 #define SKYPE_DEFAULT_SERVER "localhost"
 #define SKYPE_DEFAULT_PORT "2727"
-#define IRC_LINE_SIZE 1024
+#define IRC_LINE_SIZE 16384
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
@@ -194 +194 @@
 {
         struct skype_buddy_ask_data *bla = data;
-        skype_printf(bla->ic, "SET USER %s ISAUTHORIZED TRUE",
+        skype_printf(bla->ic, "SET USER %s ISAUTHORIZED TRUE\n",
                 bla->handle);
         g_free(bla->handle);
@@ -203 +203 @@
 {
         struct skype_buddy_ask_data *bla = data;
-        skype_printf(bla->ic, "SET USER %s ISAUTHORIZED FALSE",
+        skype_printf(bla->ic, "SET USER %s ISAUTHORIZED FALSE\n",
                 bla->handle);
         g_free(bla->handle);
@@ -226 +226 @@
 {
         struct skype_buddy_ask_data *bla = data;
-        skype_printf(bla->ic, "SET CALL %s STATUS INPROGRESS",
+        skype_printf(bla->ic, "SET CALL %s STATUS INPROGRESS\n",
                 bla->handle);
         g_free(bla->handle);
@@ -235 +235 @@
 {
         struct skype_buddy_ask_data *bla = data;
-        skype_printf(bla->ic, "SET CALL %s STATUS FINISHED",
+        skype_printf(bla->ic, "SET CALL %s STATUS FINISHED\n",
                 bla->handle);
         g_free(bla->handle);
@@ -918 +918 @@
                         /* Number of users changed in this group, query its type to see
                          * if it's a custom one we should care about. */
-                        skype_printf(ic, "GET GROUP %s TYPE", id);
+                        skype_printf(ic, "GET GROUP %s TYPE\n", id);
                         return;
                 }
@@ -927 +927 @@
 
                 if (sg) {
-                        skype_printf(ic, "ALTER GROUP %d ADDUSER %s", sg->id, sd->pending_user);
+                        skype_printf(ic, "ALTER GROUP %d ADDUSER %s\n", sg->id, sd->pending_user);
                         g_free(sd->pending_user);
                         sd->pending_user = NULL;
@@ -935 +935 @@
         } else if (!strcmp(info, "TYPE CUSTOM_GROUP"))
                 /* This one is interesting, query its users. */
-                skype_printf(ic, "GET GROUP %s USERS", id);
+                skype_printf(ic, "GET GROUP %s USERS\n", id);
 }
 
@@ -1147 +1147 @@
         /* Read the whole data. */
         st = ssl_read(sd->ssl, buf, sizeof(buf));
+        if (st >= IRC_LINE_SIZE-1) {
+                /* As we don't buffer incoming data, if IRC_LINE_SIZE amount of bytes
+                 * were received, there's a good chance last message was truncated
+                 * and the next recv() will yield garbage. */
+                imcb_error(ic, "Unable to handle incoming data from skyped");
+                st = 0;
+        }
         if (st > 0) {
                 buf[st] = '\0';
@@ -1338 +1345 @@
         struct im_connection *ic = acc->ic;
 
-        skype_printf(ic, "SET PROFILE FULLNAME %s", value);
+        skype_printf(ic, "SET PROFILE FULLNAME %s\n", value);
         return value;
 }
@@ -1347 +1354 @@
         struct im_connection *ic = acc->ic;
 
-        skype_printf(ic, "SET PROFILE MOOD_TEXT %s", value);
+        skype_printf(ic, "SET PROFILE MOOD_TEXT %s\n", value);
         return value;
 }
@@ -1356 +1363 @@
         struct im_connection *ic = acc->ic;
 
-        skype_printf(ic, "GET PROFILE PSTN_BALANCE");
+        skype_printf(ic, "GET PROFILE PSTN_BALANCE\n");
         return value;
 }
@@ -1367 +1374 @@
         if (ptr)
                 *ptr = '\0';
-        skype_printf(ic, "CALL %s", nick);
+        skype_printf(ic, "CALL %s\n", nick);
         g_free(nick);
 }
@@ -1376 +1383 @@
 
         if (sd->call_id) {
-                skype_printf(ic, "SET CALL %s STATUS FINISHED",
+                skype_printf(ic, "SET CALL %s STATUS FINISHED\n",
                                 sd->call_id);
                 g_free(sd->call_id);
@@ -1416 +1423 @@
                         /* No such group, we need to create it, then have to
                          * add the user once it's created. */
-                        skype_printf(ic, "CREATE GROUP %s", group);
+                        skype_printf(ic, "CREATE GROUP %s\n", group);
                         sd->pending_user = g_strdup(nick);
                 } else {
-                        skype_printf(ic, "ALTER GROUP %d ADDUSER %s", sg->id, nick);
+                        skype_printf(ic, "ALTER GROUP %d ADDUSER %s\n", sg->id, nick);
                 }
         }
@@ -1523 +1530 @@
 }
 
-static void skype_set_my_name(struct im_connection *ic, char *info)
-{
-        skype_set_display_name(set_find(&ic->acc->set, "display_name"), info);
-}
-
 static void skype_init(account_t *acc)
 {
@@ -1584 +1586 @@
 
         if (ret == NULL) {
-                static const struct buddy_action ba[3] = {
+                static const struct buddy_action ba[2] = {
                         {"CALL", "Initiate a call" },
                         {"HANGUP", "Hang up a call" },
                 };
-
-                ret = g_list_prepend(ret, (void *) ba + 0);
+                int i;
+
+                for (i = 0; i < ARRAY_SIZE(ba); i++)
+                        ret = g_list_prepend(ret, (void *)(ba + i));
         }
 
@@ -1620 +1624 @@
         ret->buddy_msg = skype_buddy_msg;
         ret->get_info = skype_get_info;
-        ret->set_my_name = skype_set_my_name;
         ret->away_states = skype_away_states;
         ret->set_away = skype_set_away;