upnpstun.c: Parse more fields from STUN packet

These fields are sent by e.g. stun.ekiga.net
This commit is contained in:
Pali Rohár 2020-05-08 16:25:43 +02:00
parent 420cfaf208
commit 92a1ee9a7d
1 changed files with 7 additions and 0 deletions

View File

@ -352,16 +352,23 @@ static int parse_stun_response(unsigned char *buffer, size_t len, struct sockadd
attr_len - 4, ptr + 4); attr_len - 4, ptr + 4);
} }
break; break;
case 0x0004: /* SOURCE-ADDRESS (RFC 3489) */
case 0x0005: /* CHANGED-ADDRESS (RFC 3489) */
case 0x802b: /* RESPONSE-ORIGIN (RFC 5780) */ case 0x802b: /* RESPONSE-ORIGIN (RFC 5780) */
case 0x802c: /* OTHER-ADDRESS (RFC 5780) */ case 0x802c: /* OTHER-ADDRESS (RFC 5780) */
if (attr_len == 8 && ptr[1] == 1) { if (attr_len == 8 && ptr[1] == 1) {
syslog(LOG_DEBUG, "%s: %s %hhu.%hhu.%hhu.%hhu:%hu", syslog(LOG_DEBUG, "%s: %s %hhu.%hhu.%hhu.%hhu:%hu",
"parse_stun_response", "parse_stun_response",
(attr_type == 0x0004) ? "SOURCE-ADDRESS" :
(attr_type == 0x0005) ? "CHANGED-ADDRESS" :
(attr_type == 0x802b) ? "RESPONSE-ORIGIN" : "OTHER-ADDRESS", (attr_type == 0x802b) ? "RESPONSE-ORIGIN" : "OTHER-ADDRESS",
ptr[4], ptr[5], ptr[6], ptr[7], ptr[4], ptr[5], ptr[6], ptr[7],
(uint16_t)((ptr[2] << 8) + ptr[3])); (uint16_t)((ptr[2] << 8) + ptr[3]));
} }
break; break;
case 0x8022: /* SOFTWARE (RFC 5780) */
syslog(LOG_DEBUG, "%s: SOFTWARE %.*s", "parse_stun_response", attr_len, ptr);
break;
default: default:
syslog(LOG_WARNING, "%s: unknown attribute type 0x%04x (len=%hu)", syslog(LOG_WARNING, "%s: unknown attribute type 0x%04x (len=%hu)",
"parse_stun_response", attr_type, attr_len); "parse_stun_response", attr_type, attr_len);