status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

upnpstun.c: support for more attributes types 

0x0009: /* ERROR-CODE */
 0x0020: /* XOR-MAPPED-ADDRESS (RFC 5389) */
 0x802b: /* RESPONSE-ORIGIN (RFC 5780) */
 0x802c: /* OTHER-ADDRESS (RFC 5780) */
This commit is contained in:
Thomas Bernard 2020-04-21 23:25:17 +02:00
parent 78956a97df
commit fcac8b9690
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
miniupnpd/upnpstun.c
View File

@ -314,6 +314,7 @@ static int parse_stun_response(unsigned char *buffer, size_t len, struct sockadd
switch (attr_type) {
case 0x0001: /* MAPPED-ADDRESS */
case 0x0020: /* XOR-MAPPED-ADDRESS (RFC 5389) */
case 0x8020: /* XOR-MAPPED-ADDRESS (2005 draft) */
/* Mapped Address or XOR Mapped Address */
if (attr_len == 8 && ptr[1] == 1) {
@ -339,6 +340,22 @@ static int parse_stun_response(unsigned char *buffer, size_t len, struct sockadd
have_address = 1;
}
break;
case 0x0009: /* ERROR-CODE */
if (attr_len >= 4) {
syslog(LOG_WARNING, "%s: ERROR-CODE %u %.*s",
"parse_stun_response", (unsigned)ptr[2] * 100 + ptr[3],
attr_len - 4, ptr + 4);
}
break;
case 0x802b: /* RESPONSE-ORIGIN (RFC 5780) */
case 0x802c: /* OTHER-ADDRESS (RFC 5780) */
if (attr_len == 8 && ptr[1] == 1) {
syslog(LOG_DEBUG, "%s: %s %hhu.%hhu.%hhu.%hhu:%hu",
"parse_stun_response",
(attr_type == 0x802b) ? "RESPONSE-ORIGIN" : "OTHER-ADDRESS",
ptr[4], ptr[5], ptr[6], ptr[7], ((uint16_t)ptr[2] << 8) + ptr[3]);
}
break;
default:
syslog(LOG_WARNING, "%s: unknown attribute type 0x%04x (len=%hu)",
"parse_stun_response", attr_type, attr_len);