From 62fdf849ffac4d68091e7f42f51011fb6d415285 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Sun, 9 Jul 2006 10:11:43 +0000 Subject: Fix minor bug in displaying invalid message (previously the whole TCP packet was printed while it should only print the message chunk) git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@596 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/src/pjsip/sip_endpoint.c | 3 ++- pjsip/src/pjsip/sip_transport.c | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c index 70af7f29..28476112 100644 --- a/pjsip/src/pjsip/sip_endpoint.c +++ b/pjsip/src/pjsip/sip_endpoint.c @@ -717,13 +717,14 @@ static void endpt_on_rx_msg( pjsip_endpoint *endpt, PJ_LOG(1, (THIS_FILE, "Error processing packet from %s:%d: %s %s [code %d]:\n" - "%s\n" + "%.*s\n" "-- end of packet.", rdata->pkt_info.src_name, rdata->pkt_info.src_port, errmsg, info, status, + (int)rdata->msg_info.len, rdata->msg_info.msg_buf)); return; } diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c index aa49615e..2ee47deb 100644 --- a/pjsip/src/pjsip/sip_transport.c +++ b/pjsip/src/pjsip/sip_transport.c @@ -954,13 +954,9 @@ PJ_DEF(pj_ssize_t) pjsip_tpmgr_receive_packet( pjsip_tpmgr *mgr, /* Parse the message. */ rdata->msg_info.msg = msg = pjsip_parse_rdata( current_pkt, msg_fragment_size, rdata); - if (msg == NULL) { - mgr->on_rx_msg(mgr->endpt, PJSIP_EINVALIDMSG, rdata); - goto finish_process_fragment; - } /* Check for parsing syntax error */ - if (!pj_list_empty(&rdata->msg_info.parse_err)) { + if (msg==NULL || !pj_list_empty(&rdata->msg_info.parse_err)) { pjsip_parser_err_report *err; char buf[128]; pj_str_t tmp; -- cgit v1.2.3