mirror of https://github.com/asterisk/asterisk
Fixes: #406 UserNote: Bundled pjproject has been upgraded to 2.14. For more information on what all is included in this change, check out the pjproject Github page: https://github.com/pjsip/pjproject/releasespull/606/head
parent
3f00a32d9d
commit
6222e73cd8
@ -1,46 +0,0 @@
|
||||
From ac685b30c17be461b2bf5b46a772ed9742b8e985 Mon Sep 17 00:00:00 2001
|
||||
From: Riza Sulistyo <trengginas@users.noreply.github.com>
|
||||
Date: Thu, 9 Feb 2023 13:19:23 +0700
|
||||
Subject: [PATCH] Make sure that NOTIFY tdata is set before sending it.
|
||||
|
||||
---
|
||||
pjsip/src/pjsip-simple/evsub.c | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/pjsip/src/pjsip-simple/evsub.c b/pjsip/src/pjsip-simple/evsub.c
|
||||
index da0a9b416..68c1d3951 100644
|
||||
--- a/pjsip/src/pjsip-simple/evsub.c
|
||||
+++ b/pjsip/src/pjsip-simple/evsub.c
|
||||
@@ -2216,23 +2216,26 @@ static void on_tsx_state_uas( pjsip_evsub *sub, pjsip_transaction *tsx,
|
||||
}
|
||||
|
||||
} else {
|
||||
sub->state = old_state;
|
||||
sub->state_str = old_state_str;
|
||||
}
|
||||
|
||||
/* Send the pending NOTIFY sent by app from inside
|
||||
* on_rx_refresh() callback.
|
||||
*/
|
||||
- pj_assert(sub->pending_notify);
|
||||
- status = pjsip_evsub_send_request(sub, sub->pending_notify);
|
||||
- sub->pending_notify = NULL;
|
||||
+ //pj_assert(sub->pending_notify);
|
||||
+ /* Make sure that pending_notify is set. */
|
||||
+ if (sub->pending_notify) {
|
||||
+ status = pjsip_evsub_send_request(sub, sub->pending_notify);
|
||||
+ sub->pending_notify = NULL;
|
||||
+ }
|
||||
|
||||
} else if (pjsip_method_cmp(&tsx->method, &pjsip_notify_method)==0) {
|
||||
|
||||
/* Handle authentication */
|
||||
if (tsx->state == PJSIP_TSX_STATE_COMPLETED &&
|
||||
(tsx->status_code==401 || tsx->status_code==407))
|
||||
{
|
||||
pjsip_tx_data *tdata;
|
||||
pj_status_t status;
|
||||
pjsip_rx_data *rdata = event->body.tsx_state.src.rdata;
|
||||
--
|
||||
2.39.1
|
||||
|
@ -1,28 +0,0 @@
|
||||
diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
|
||||
index 4f483faa1..12439e3ee 100644
|
||||
--- a/pjsip/src/pjsip/sip_transport.c
|
||||
+++ b/pjsip/src/pjsip/sip_transport.c
|
||||
@@ -2088,15 +2088,17 @@ PJ_DEF(pj_ssize_t) pjsip_tpmgr_receive_packet( pjsip_tpmgr *mgr,
|
||||
* which were sent to keep NAT bindings.
|
||||
*/
|
||||
if (tmp.slen) {
|
||||
- PJ_LOG(1, (THIS_FILE,
|
||||
- "Error processing %d bytes packet from %s %s:%d %.*s:\n"
|
||||
- "%.*s\n"
|
||||
- "-- end of packet.",
|
||||
+ PJ_LOG(2, (THIS_FILE,
|
||||
+ "Dropping %d bytes packet from %s %s:%d %.*s\n",
|
||||
msg_fragment_size,
|
||||
rdata->tp_info.transport->type_name,
|
||||
- rdata->pkt_info.src_name,
|
||||
+ rdata->pkt_info.src_name,
|
||||
rdata->pkt_info.src_port,
|
||||
- (int)tmp.slen, tmp.ptr,
|
||||
+ (int)tmp.slen, tmp.ptr));
|
||||
+ PJ_LOG(4, (THIS_FILE,
|
||||
+ "Dropped packet:"
|
||||
+ "%.*s\n"
|
||||
+ "-- end of packet.",
|
||||
(int)msg_fragment_size,
|
||||
rdata->msg_info.msg_buf));
|
||||
}
|
@ -1 +0,0 @@
|
||||
3522e36cdf67d32fd47eb9b5c6d10642 pjproject-2.13.1.tar.bz2
|
@ -0,0 +1 @@
|
||||
d0c0590e6aa8b556a33300e6c709bea4 pjproject-2.14.tar.bz2
|
Loading…
Reference in new issue