Changeset 54 for pjproject/trunk/pjsip/src/pjsip/sip_parser.c
- Timestamp:
- Nov 18, 2005 10:43:42 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip/src/pjsip/sip_parser.c
r51 r54 559 559 560 560 context.scanner = &scanner; 561 context.pool = rdata-> pool;561 context.pool = rdata->tp_info.pool; 562 562 context.rdata = rdata; 563 563 564 564 PJ_TRY { 565 rdata->msg = int_parse_msg(&context, &rdata->parse_err);565 rdata->msg_info.msg = int_parse_msg(&context, &rdata->msg_info.parse_err); 566 566 } 567 567 PJ_DEFAULT { 568 rdata->msg = NULL;568 rdata->msg_info.msg = NULL; 569 569 } 570 570 PJ_END 571 571 572 572 pj_scan_fini(&scanner); 573 return rdata->msg ;573 return rdata->msg_info.msg; 574 574 } 575 575 … … 1259 1259 1260 1260 if (ctx->rdata) 1261 ctx->rdata-> call_id = hdr->id;1261 ctx->rdata->msg_info.call_id = hdr->id; 1262 1262 1263 1263 return (pjsip_hdr*)hdr; … … 1340 1340 1341 1341 if (ctx->rdata) 1342 ctx->rdata-> clen = hdr;1342 ctx->rdata->msg_info.clen = hdr; 1343 1343 1344 1344 return (pjsip_hdr*)hdr; … … 1368 1368 1369 1369 if (ctx->rdata) 1370 ctx->rdata-> ctype = hdr;1370 ctx->rdata->msg_info.ctype = hdr; 1371 1371 1372 1372 return (pjsip_hdr*)hdr; … … 1389 1389 1390 1390 if (ctx->rdata) 1391 ctx->rdata-> cseq = hdr;1391 ctx->rdata->msg_info.cseq = hdr; 1392 1392 1393 1393 return (pjsip_hdr*)hdr; … … 1433 1433 parse_hdr_fromto(ctx->scanner, ctx->pool, hdr); 1434 1434 if (ctx->rdata) 1435 ctx->rdata-> from = hdr;1435 ctx->rdata->msg_info.from = hdr; 1436 1436 1437 1437 return (pjsip_hdr*)hdr; … … 1444 1444 parse_generic_array_hdr(hdr, ctx->scanner); 1445 1445 1446 if (ctx->rdata && ctx->rdata-> require == NULL)1447 ctx->rdata-> require = hdr;1446 if (ctx->rdata && ctx->rdata->msg_info.require == NULL) 1447 ctx->rdata->msg_info.require = hdr; 1448 1448 1449 1449 return (pjsip_hdr*)hdr; … … 1475 1475 1476 1476 if (ctx->rdata) 1477 ctx->rdata-> to = hdr;1477 ctx->rdata->msg_info.to = hdr; 1478 1478 1479 1479 return (pjsip_hdr*)hdr; … … 1529 1529 1530 1530 if (ctx->rdata) 1531 ctx->rdata->m ax_fwd = hdr;1531 ctx->rdata->msg_info.max_fwd = hdr; 1532 1532 1533 1533 return (pjsip_hdr*)hdr; … … 1579 1579 parse_hdr_end(scanner); 1580 1580 1581 if (ctx->rdata && ctx->rdata-> record_route==NULL)1582 ctx->rdata-> record_route = first;1581 if (ctx->rdata && ctx->rdata->msg_info.record_route==NULL) 1582 ctx->rdata->msg_info.record_route = first; 1583 1583 1584 1584 return (pjsip_hdr*)first; … … 1607 1607 parse_hdr_end(scanner); 1608 1608 1609 if (ctx->rdata && ctx->rdata-> route==NULL)1610 ctx->rdata-> route = first;1609 if (ctx->rdata && ctx->rdata->msg_info.route==NULL) 1610 ctx->rdata->msg_info.route = first; 1611 1611 1612 1612 return (pjsip_hdr*)first; … … 1660 1660 parse_hdr_end(scanner); 1661 1661 1662 if (ctx->rdata && ctx->rdata-> via == NULL)1663 ctx->rdata-> via = first;1662 if (ctx->rdata && ctx->rdata->msg_info.via == NULL) 1663 ctx->rdata->msg_info.via = first; 1664 1664 1665 1665 return (pjsip_hdr*)first;
Note: See TracChangeset
for help on using the changeset viewer.