Changeset 62f6b45

Timestamp:

2012-11-11T16:53:56Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1388d30

Parents:

dff0e0b

Message:

Realised I don't need delimited=length at all, objects are guaranteed to be
CRLF-terminated.

File:

• protocols/twitter/twitter_lib.c (modified) (2 diffs)

protocols/twitter/twitter_lib.c

@@ -732 +732 @@
 {
         struct im_connection *ic = req->data;
-        //struct twitter_data *td = ic->proto_data;
         json_value *parsed;
-        int len, i;
-        char c;
+        int len = 0;
+        char c, *nl;
         
         if (!g_slist_find(twitter_connections, ic))
                 return;
-        //td = ic->proto_data;;
         
         printf( "%d bytes in stream\n", req->body_size );
         
-        /* m/^[\d\s]*/      /* why is there a second commend here? :-) */
-        for (i = 0; i < req->body_size; i ++) {
-                if (!isspace(req->reply_body[i]) && !isdigit(req->reply_body[i]))
-                        break;
-        }
-        
-        /* Nothing but numbers and whitespace in there. Try again later. */
-        if (i == req->body_size)
-                return;
-        
-        /* Get length. */
-        if (sscanf(req->reply_body, "%d", &len) != 1)
-                return;
-        
-        if (req->body_size < i + len) {
-                printf("Not enough bytes in buffer yet\n");
-                return;
-        }
-        
-        http_flush_bytes(req, i);
-        c = req->reply_body[len];
-        req->reply_body[len] = '\0';
-        
-        printf("JSON: %s\n", req->reply_body);
-        printf("parsed: %p\n", (parsed = json_parse(req->reply_body)));
-        if (parsed) {
-                twitter_stream_handle_object(ic, parsed);
-        }
-        json_value_free(parsed);
-        req->reply_body[len] = c;
-        
-        http_flush_bytes(req, len);
+        /* MUST search for CRLF, not just LF:
+           https://dev.twitter.com/docs/streaming-apis/processing#Parsing_responses */
+        nl = strstr(req->reply_body, "\r\n");
+        
+        if (!nl) {
+                printf("Incomplete data\n");
+                return;
+        }
+        
+        len = nl - req->reply_body;
+        if (len > 0) {
+                c = req->reply_body[len];
+                req->reply_body[len] = '\0';
+                
+                printf("JSON: %s\n", req->reply_body);
+                printf("parsed: %p\n", (parsed = json_parse(req->reply_body)));
+                if (parsed) {
+                        twitter_stream_handle_object(ic, parsed);
+                }
+                json_value_free(parsed);
+                req->reply_body[len] = c;
+        }
+        
+        http_flush_bytes(req, len + 2);
         
         /* One notification might bring multiple events! */
@@ -799 +789 @@
 {
         struct twitter_data *td = ic->proto_data;
-        char *args[4] = {"with", "followings", "delimited", "length"};
+        char *args[2] = {"with", "followings"};
         
         if ((td->stream = twitter_http(ic, TWITTER_USER_STREAM_URL,
-                                       twitter_http_stream, ic, 0, args, 4))) {
+                                       twitter_http_stream, ic, 0, args, 2))) {
                 /* This flag must be enabled or we'll get no data until EOF
                    (which err, kind of, defeats the purpose of a streaming API). */