Changeset aed152f
- Timestamp:
- 2010-03-21T01:02:03Z (15 years ago)
- Branches:
- master
- Children:
- 2e89256
- Parents:
- 54a2014
- Location:
- protocols/jabber
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/iq.c
r54a2014 raed152f 128 128 { 129 129 if( ( c = xt_find_node( node->children, "si" ) ) && 130 ( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_SI ) == 0 ) ) 130 ( s = xt_find_attr( c, "xmlns" ) ) && 131 ( strcmp( s, XMLNS_SI ) == 0 ) ) 131 132 { 132 133 return jabber_si_handle_request( ic, node, c ); -
protocols/jabber/si.c
r54a2014 raed152f 208 208 struct jabber_buddy *bud; 209 209 int requestok = FALSE; 210 char *name ;210 char *name, *cmp; 211 211 size_t size; 212 212 struct jabber_transfer *tf; … … 227 227 !( iq_id = xt_find_attr( node, "id" ) ) || 228 228 !( sid = xt_find_attr( sinode, "id" ) ) || 229 !( strcmp( xt_find_attr( sinode, "profile" ), XMLNS_FILETRANSFER ) == 0 ) || 229 !( cmp = xt_find_attr( sinode, "profile" ) ) || 230 !( 0 == strcmp( cmp, XMLNS_FILETRANSFER ) ) || 230 231 !( d = xt_find_node( sinode->children, "file" ) ) || 231 !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FILETRANSFER ) == 0 ) || 232 !( cmp = xt_find_attr( d, "xmlns" ) ) || 233 !( 0 == strcmp( cmp, XMLNS_FILETRANSFER ) ) || 232 234 !( name = xt_find_attr( d, "name" ) ) || 233 235 !( size_s = xt_find_attr( d, "size" ) ) || 234 236 !( 1 == sscanf( size_s, "%zd", &size ) ) || 235 237 !( d = xt_find_node( sinode->children, "feature" ) ) || 236 !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FEATURE ) == 0 ) || 238 !( cmp = xt_find_attr( d, "xmlns" ) ) || 239 !( 0 == strcmp( cmp, XMLNS_FEATURE ) ) || 237 240 !( d = xt_find_node( d->children, "x" ) ) || 238 !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_XDATA ) == 0 ) || 239 !( strcmp( xt_find_attr( d, "type" ), "form" ) == 0 ) || 241 !( cmp = xt_find_attr( d, "xmlns" ) ) || 242 !( 0 == strcmp( cmp, XMLNS_XDATA ) ) || 243 !( cmp = xt_find_attr( d, "type" ) ) || 244 !( 0 == strcmp( cmp, "form" ) ) || 240 245 !( d = xt_find_node( d->children, "field" ) ) || 241 !( strcmp( xt_find_attr( d, "var" ), "stream-method" ) == 0 ) ) 246 !( cmp = xt_find_attr( d, "var" ) ) || 247 !( 0 == strcmp( cmp, "stream-method" ) ) ) 242 248 { 243 249 imcb_log( ic, "WARNING: Received incomplete Stream Initiation request" ); … … 367 373 { 368 374 struct xt_node *c, *d; 369 char *ini_jid, *tgt_jid, *iq_id ;375 char *ini_jid, *tgt_jid, *iq_id, *cmp; 370 376 GSList *tflist; 371 377 struct jabber_transfer *tf=NULL; … … 392 398 !( iq_id = xt_find_attr( node, "id" ) ) || 393 399 !( c = xt_find_node( node->children, "si" ) ) || 394 !( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_SI ) == 0 ) || 395 /* !( d = xt_find_node( c->children, "file" ) ) || 396 !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FILETRANSFER ) == 0 ) || */ 400 !( cmp = xt_find_attr( c, "xmlns" ) ) || 401 !( strcmp( cmp, XMLNS_SI ) == 0 ) || 397 402 !( d = xt_find_node( c->children, "feature" ) ) || 398 !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FEATURE ) == 0 ) || 403 !( cmp = xt_find_attr( d, "xmlns" ) ) || 404 !( strcmp( cmp, XMLNS_FEATURE ) == 0 ) || 399 405 !( d = xt_find_node( d->children, "x" ) ) || 400 !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_XDATA ) == 0 ) || 401 !( strcmp( xt_find_attr( d, "type" ), "submit" ) == 0 ) || 406 !( cmp = xt_find_attr( d, "xmlns" ) ) || 407 !( strcmp( cmp, XMLNS_XDATA ) == 0 ) || 408 !( cmp = xt_find_attr( d, "type" ) ) || 409 !( strcmp( cmp, "submit" ) == 0 ) || 402 410 !( d = xt_find_node( d->children, "field" ) ) || 403 !( strcmp( xt_find_attr( d, "var" ), "stream-method" ) == 0 ) || 411 !( cmp = xt_find_attr( d, "var" ) ) || 412 !( strcmp( cmp, "stream-method" ) == 0 ) || 404 413 !( d = xt_find_node( d->children, "value" ) ) ) 405 414 {
Note: See TracChangeset
for help on using the changeset viewer.