Mercurial > pidgin.yaz
comparison libpurple/protocols/simple/simple.c @ 25334:9bdd3ab8087f
propagate from branch 'im.pidgin.pidgin' (head 4cc0bbe98be861a279e3b1fd97a3b4d491dec519)
to branch 'im.pidgin.pidgin.next.minor' (head 0bc630b4c58beab06485f17e1633164d548ca68a)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 27 Nov 2008 06:57:15 +0000 |
| parents | 94fa7211eb98 7d07bb66f70b |
| children | 65cfc59858cf |
comparison
equal
deleted
inserted
replaced
| 25333:244863136504 | 25334:9bdd3ab8087f |
|---|---|
| 1637 time_t currtime = time(NULL); | 1637 time_t currtime = time(NULL); |
| 1638 cur += 2; | 1638 cur += 2; |
| 1639 cur[0] = '\0'; | 1639 cur[0] = '\0'; |
| 1640 purple_debug_info("simple", "\n\nreceived - %s\n######\n%s\n#######\n\n", ctime(&currtime), conn->inbuf); | 1640 purple_debug_info("simple", "\n\nreceived - %s\n######\n%s\n#######\n\n", ctime(&currtime), conn->inbuf); |
| 1641 msg = sipmsg_parse_header(conn->inbuf); | 1641 msg = sipmsg_parse_header(conn->inbuf); |
| 1642 | |
| 1643 if(!msg) { | |
| 1644 /* Should we re-use this error message (from lower in the function)? */ | |
| 1645 purple_debug_misc("simple", "received a incomplete sip msg: %s\n", conn->inbuf); | |
| 1646 return; | |
| 1647 } | |
| 1648 | |
| 1642 cur[0] = '\r'; | 1649 cur[0] = '\r'; |
| 1643 cur += 2; | 1650 cur += 2; |
| 1644 restlen = conn->inbufused - (cur - conn->inbuf); | 1651 restlen = conn->inbufused - (cur - conn->inbuf); |
| 1645 if(restlen >= msg->bodylen) { | 1652 if(restlen >= msg->bodylen) { |
| 1646 dummy = g_malloc(msg->bodylen + 1); | 1653 dummy = g_malloc(msg->bodylen + 1); |