diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-09-28 08:07:27 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-09-28 08:07:27 -0500 |
| commit | 821927b077e5b71c10c56c25b58138dc3e5e6854 (patch) | |
| tree | 992517023ba6a68596ef748264640dd2fccb82f4 | |
| parent | 77558d80f33f31df7b339bbdb01d8520770560b1 (diff) | |
| parent | 95eae41b37b1b709ed769bb2d93a6677b273d0e6 (diff) | |
Merge "pjproject: Patch to correct STUN FINGERPRINT usage" into 14
| -rw-r--r-- | third-party/pjproject/patches/0080-STUN-Fingerprint-with-ICE.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/third-party/pjproject/patches/0080-STUN-Fingerprint-with-ICE.patch b/third-party/pjproject/patches/0080-STUN-Fingerprint-with-ICE.patch new file mode 100644 index 000000000..96d44fa2e --- /dev/null +++ b/third-party/pjproject/patches/0080-STUN-Fingerprint-with-ICE.patch @@ -0,0 +1,35 @@ +From 28490e9ddee0937516f9edcaf95d274fe5ceaf4c Mon Sep 17 00:00:00 2001 +From: Sean Bright <sean.bright@gmail.com> +Date: Mon, 25 Sep 2017 14:06:53 -0400 +Subject: [PATCH] ICE: Use STUN FINGERPRINT attribute when sending keepalives + +Per RFC 5245 Section 10: + + If STUN is being used for keepalives, a STUN Binding Indication is + used [RFC5389]. The Indication MUST NOT utilize any authentication + mechanism. It SHOULD contain the FINGERPRINT attribute to aid in + demultiplexing, but SHOULD NOT contain any other attributes. +--- + pjnath/src/pjnath/ice_session.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c +index 159d7b1..f90005a 100644 +--- a/pjnath/src/pjnath/ice_session.c ++++ b/pjnath/src/pjnath/ice_session.c +@@ -1217,10 +1217,8 @@ static void ice_keep_alive(pj_ice_sess *ice, pj_bool_t send_now) + msg_data = PJ_POOL_ZALLOC_T(tdata->pool, pj_ice_msg_data); + msg_data->transport_id = the_check->lcand->transport_id; + +- /* Temporarily disable FINGERPRINT. The Binding Indication +- * SHOULD NOT contain any attributes. +- */ +- saved = pj_stun_session_use_fingerprint(comp->stun_sess, PJ_FALSE); ++ /* Make sure that the FINGERPRINT attribute is used per RFC 5245 Section 10 */ ++ saved = pj_stun_session_use_fingerprint(comp->stun_sess, PJ_TRUE); + + /* Send to session */ + addr_len = pj_sockaddr_get_len(&the_check->rcand->addr); +-- +2.7.4 + |