diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-10-07 08:42:28 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-10-07 08:42:28 +0000 |
| commit | a7690a7389f967f2a1c3a50d393ee8ed3db08773 (patch) | |
| tree | a01fd17abbc4c85c8dc0965c9b9fb68133df6ef0 | |
| parent | 08073d715d2594a08e1000079be1558974de0217 (diff) | |
More #962: STUN compatibility problem with RFC 3489 servers (in encoding SERVER-NAME or SOFTWARE attribute):
- backported r2928
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/adhocs/1.4.5@2929 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjnath/src/pjnath-test/stun.c | 8 | ||||
| -rw-r--r-- | pjnath/src/pjnath/stun_msg.c | 18 |
2 files changed, 22 insertions, 4 deletions
diff --git a/pjnath/src/pjnath-test/stun.c b/pjnath/src/pjnath-test/stun.c index 9efc08d9..ccfbc474 100644 --- a/pjnath/src/pjnath-test/stun.c +++ b/pjnath/src/pjnath-test/stun.c @@ -479,7 +479,9 @@ static struct test_vector "", "", &create_msgint1 - }, + } + /* disabled: see http://trac.pjsip.org/repos/ticket/960 + , { PJ_STUN_BINDING_RESPONSE, "\xb7\xe7\xa7\x01\xbc\x34\xd6\x86\xfa\x87\xdf\xae", @@ -503,6 +505,9 @@ static struct test_vector "", &create_msgint2 } + */ + + /* disabled: see http://trac.pjsip.org/repos/ticket/960 #if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0 , { @@ -542,6 +547,7 @@ static struct test_vector &create_msgint3 } #endif + */ }; diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c index fb9f1cb9..e9c86212 100644 --- a/pjnath/src/pjnath/stun_msg.c +++ b/pjnath/src/pjnath/stun_msg.c @@ -1235,10 +1235,22 @@ static pj_status_t encode_string_attr(const void *a, pj_uint8_t *buf, PUTVAL16H(buf, 0, ca->hdr.type); - /* Set the length to be 4-bytes aligned so that we can - * communicate with RFC 3489 endpoints + /* Special treatment for SOFTWARE attribute: + * This attribute had caused interop problem when talking to + * legacy RFC 3489 STUN servers, due to different "length" + * rules with RFC 5389. */ - PUTVAL16H(buf, 2, (pj_uint16_t)((ca->value.slen + 3) & (~3))); + if (msghdr->magic != PJ_STUN_MAGIC || + ca->hdr.type == PJ_STUN_ATTR_SOFTWARE) + { + /* Set the length to be 4-bytes aligned so that we can + * communicate with RFC 3489 endpoints + */ + PUTVAL16H(buf, 2, (pj_uint16_t)((ca->value.slen + 3) & (~3))); + } else { + /* Use RFC 5389 rule */ + PUTVAL16H(buf, 2, (pj_uint16_t)ca->value.slen); + } /* Copy the string */ pj_memcpy(buf+ATTR_HDR_LEN, ca->value.ptr, ca->value.slen); |