comparison src/protocols/jabber/jabber.c @ 6004:3b4f94adc7d4

[gaim-migrate @ 6452] another segfault fix, and some compile warning cleanups committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Thu, 03 Jul 2003 21:21:34 +0000
parents 0ca618645cec
children d8cd876e613e
comparison
equal deleted inserted replaced
6003:0ca618645cec 6004:3b4f94adc7d4
667 #ifndef _WIN32 667 #ifndef _WIN32
668 if ((len = read(gjc->fd, buf, sizeof(buf) - 1)) > 0) { 668 if ((len = read(gjc->fd, buf, sizeof(buf) - 1)) > 0) {
669 #else 669 #else
670 if ((len = recv(gjc->fd, buf, sizeof(buf) - 1, 0)) > 0) { 670 if ((len = recv(gjc->fd, buf, sizeof(buf) - 1, 0)) > 0) {
671 #endif 671 #endif
672 struct jabber_data *jd = GJ_GC(gjc)->proto_data;
673 buf[len] = '\0'; 672 buf[len] = '\0';
674 gaim_debug(GAIM_DEBUG_MISC, "jabber", 673 gaim_debug(GAIM_DEBUG_MISC, "jabber",
675 "input (len %d): %s\n", len, buf); 674 "input (len %d): %s\n", len, buf);
676 XML_Parse(gjc->parser, buf, len, 0); 675 XML_Parse(gjc->parser, buf, len, 0);
677 } else if (len < 0 || errno != EAGAIN) { 676 } else if (len < 0 || errno != EAGAIN) {
1917 } 1916 }
1918 } else { 1917 } else {
1919 xmlnode xerr; 1918 xmlnode xerr;
1920 char *errmsg = NULL; 1919 char *errmsg = NULL;
1921 int errcode = 0; 1920 int errcode = 0;
1922 struct jabber_data *jd = GJ_GC(gjc)->proto_data;
1923 1921
1924 gaim_debug(GAIM_DEBUG_ERROR, "jabber", "auth failed\n"); 1922 gaim_debug(GAIM_DEBUG_ERROR, "jabber", "auth failed\n");
1925 xerr = xmlnode_get_tag(p->x, "error"); 1923 xerr = xmlnode_get_tag(p->x, "error");
1926 if (xerr) { 1924 if (xerr) {
1927 char msg[BUF_LONG]; 1925 char msg[BUF_LONG];
2226 if (jpacket_subtype(p) == JPACKET__SET) { 2224 if (jpacket_subtype(p) == JPACKET__SET) {
2227 xmlnode querynode; 2225 xmlnode querynode;
2228 querynode = xmlnode_get_tag(p->x, "query"); 2226 querynode = xmlnode_get_tag(p->x, "query");
2229 from = xmlnode_get_attrib(p->x, "from"); 2227 from = xmlnode_get_attrib(p->x, "from");
2230 to = xmlnode_get_attrib(p->x, "to"); 2228 to = xmlnode_get_attrib(p->x, "to");
2231 if (NSCHECK(querynode, "jabber:iq:roster") && !strcmp(from, to)) { 2229 if (NSCHECK(querynode, "jabber:iq:roster") && (!from || !strcmp(from, to))) {
2232 jabber_handlebuddy(gjc, xmlnode_get_firstchild(querynode)); 2230 jabber_handlebuddy(gjc, xmlnode_get_firstchild(querynode));
2233 } else if(NSCHECK(querynode, "jabber:iq:oob")) { 2231 } else if(NSCHECK(querynode, "jabber:iq:oob")) {
2234 jabber_handleoob(gjc, p->x); 2232 jabber_handleoob(gjc, p->x);
2235 } 2233 }
2236 } else if (jpacket_subtype(p) == JPACKET__GET) { 2234 } else if (jpacket_subtype(p) == JPACKET__GET) {
4174 4172
4175 } else { 4173 } else {
4176 xmlnode xerr; 4174 xmlnode xerr;
4177 char *errmsg = NULL; 4175 char *errmsg = NULL;
4178 int errcode = 0; 4176 int errcode = 0;
4179 struct jabber_data *jd = GJ_GC(gjc)->proto_data;
4180 4177
4181 gaim_debug(GAIM_DEBUG_ERROR, "jabber", "registration failed\n"); 4178 gaim_debug(GAIM_DEBUG_ERROR, "jabber", "registration failed\n");
4182 xerr = xmlnode_get_tag(p->x, "error"); 4179 xerr = xmlnode_get_tag(p->x, "error");
4183 if (xerr) { 4180 if (xerr) {
4184 char msg[BUF_LONG]; 4181 char msg[BUF_LONG];