Changeset 5097 for pjproject/trunk/pjsip/src/pjsip/sip_transport.c

Timestamp:

May 18, 2015 4:42:42 AM (9 years ago)

Author:

ming

Message:

Fixed #1853: Add callback for dropped data in SIP transport

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -100 +100 @@
     pj_status_t    (*on_tx_msg)(pjsip_endpoint*, pjsip_tx_data*);
     pjsip_tp_state_callback tp_state_cb;
+    pjsip_tp_on_rx_dropped_cb tp_drop_data_cb;
 
     /* Transmit data list, for transmit data cleanup when transport manager
@@ -1694 +1695 @@
             remaining_len -= (p - current_pkt);
             total_processed += (p - current_pkt);
+
+            /* Notify application about the dropped newlines */
+            if (mgr->tp_drop_data_cb) {
+                pjsip_tp_dropped_data dd;
+                pj_bzero(&dd, sizeof(dd));
+                dd.tp = tr;
+                dd.data = current_pkt;
+                dd.len = p - current_pkt;
+                dd.status = PJ_EIGNORED;
+                (*mgr->tp_drop_data_cb)(&dd);
+            }
+
             current_pkt = p;
             if (remaining_len == 0) {
@@ -1720 +1733 @@
                 if (remaining_len == PJSIP_MAX_PKT_LEN) {
                     mgr->on_rx_msg(mgr->endpt, PJSIP_ERXOVERFLOW, rdata);
+                    
+                    /* Notify application about the message overflow */
+                    if (mgr->tp_drop_data_cb) {
+                        pjsip_tp_dropped_data dd;
+                        pj_bzero(&dd, sizeof(dd));
+                        dd.tp = tr;
+                        dd.data = current_pkt;
+                        dd.len = msg_fragment_size;
+                        dd.status = PJSIP_ERXOVERFLOW;
+                        (*mgr->tp_drop_data_cb)(&dd);
+                    }
+                    
                     /* Exhaust all data. */
                     return rdata->pkt_info.len;
@@ -1784 +1809 @@
             }
 
+            /* Notify application about the dropped data (syntax error) */
+            if (tmp.slen && mgr->tp_drop_data_cb) {
+                pjsip_tp_dropped_data dd;
+                pj_bzero(&dd, sizeof(dd));
+                dd.tp = tr;
+                dd.data = current_pkt;
+                dd.len = msg_fragment_size;
+                dd.status = PJSIP_EINVALIDMSG;
+                (*mgr->tp_drop_data_cb)(&dd);
+                
+                if (dd.len > 0 && dd.len < msg_fragment_size)
+                    msg_fragment_size = dd.len;
+            }
+
             goto finish_process_fragment;
         }
@@ -2266 +2305 @@
     return PJ_SUCCESS;
 }
+
+/*
+ * Set callback of data dropping.
+ */
+PJ_DEF(pj_status_t) pjsip_tpmgr_set_drop_data_cb(pjsip_tpmgr *mgr,
+                                                 pjsip_tp_on_rx_dropped_cb cb)
+{
+    PJ_ASSERT_RETURN(mgr, PJ_EINVAL);
+
+    mgr->tp_drop_data_cb = cb;
+
+    return PJ_SUCCESS;
+}