summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2009-10-01 12:12:15 +0000
committerBenny Prijono <bennylp@teluu.com>2009-10-01 12:12:15 +0000
commite3164315294f0d1b1d06ba75e607f561a8c7ecbc (patch)
tree91abf85a14b0e9ffc7cd2f592e05d19938f16588
parent7e439d29f58acfe82c326f1d9bade56b27fb2391 (diff)
Ticket #962 (1.4.5 branch): STUN compatibility problem with RFC 3489 servers (in encoding SERVER-NAME or SOFTWARE attribute)
- backported r2916 git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/adhocs/1.4.5@2922 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjnath/src/pjnath/stun_msg.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c
index 7cc4d24d..fb9f1cb9 100644
--- a/pjnath/src/pjnath/stun_msg.c
+++ b/pjnath/src/pjnath/stun_msg.c
@@ -1234,8 +1234,11 @@ static pj_status_t encode_string_attr(const void *a, pj_uint8_t *buf,
}
PUTVAL16H(buf, 0, ca->hdr.type);
- PUTVAL16H(buf, 2, (pj_uint16_t)ca->value.slen);
-
+
+ /* 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)));
/* Copy the string */
pj_memcpy(buf+ATTR_HDR_LEN, ca->value.ptr, ca->value.slen);