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

miniupnpd: various PCP fixes

This commit is contained in:
Thomas Bernard 2014-02-03 10:49:59 +01:00
parent f6b5408e87
commit 46905418ca
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
miniupnpd/pcpserver.c
View File

@ -1,4 +1,4 @@
/* $Id: pcpserver.c,v 1.5 2014/01/27 10:06:08 nanard Exp $ */ /* $Id: pcpserver.c,v 1.7 2014/02/03 09:38:26 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* Website : http://miniupnp.free.fr/ * Website : http://miniupnp.free.fr/
* Author : Peter Tatrai * Author : Peter Tatrai
@ -558,7 +558,7 @@ static int CheckExternalAddress(pcp_info_t* pcp_msg_info)
} }
} }
if (IN6_IS_ADDR_UNSPECIFIED(pcp_msg_info->ext_ip)) { if (pcp_msg_info->ext_ip == NULL || IN6_IS_ADDR_UNSPECIFIED(pcp_msg_info->ext_ip)) {
pcp_msg_info->ext_ip = &external_addr; pcp_msg_info->ext_ip = &external_addr;
@ -977,11 +977,16 @@ static int processPCPRequest(void * req, int req_size, pcp_info_t *pcp_msg_info)
processedSize = 0; processedSize = 0;
/* discard request that exceeds maximal length, /* discard request that exceeds maximal length,
or that is shorter than 3 or that is shorter than PCP_MIN_LEN (=24)
or that is not the multiple of 4 */ or that is not the multiple of 4 */
if (req_size < PCP_MIN_LEN) if (req_size < 3)
return 0; /* ignore msg */ return 0; /* ignore msg */
if (req_size < PCP_MIN_LEN) {
pcp_msg_info->result_code = PCP_ERR_MALFORMED_REQUEST;
return 1; /* send response */
}
if ( (req_size > PCP_MAX_LEN) || ( (req_size & 3) != 0)) { if ( (req_size > PCP_MAX_LEN) || ( (req_size & 3) != 0)) {
syslog(LOG_ERR, "PCP: Size of PCP packet(%d) is larger than %d bytes or " syslog(LOG_ERR, "PCP: Size of PCP packet(%d) is larger than %d bytes or "
"the size is not multiple of 4.\n", req_size, PCP_MAX_LEN); "the size is not multiple of 4.\n", req_size, PCP_MAX_LEN);
@ -1000,7 +1005,7 @@ static int processPCPRequest(void * req, int req_size, pcp_info_t *pcp_msg_info)
processedSize += sizeof(pcp_request_t); processedSize += sizeof(pcp_request_t);
if (common_req->ver == 1) { if (common_req->ver == 1) {
/* legacy PCP version 1 support */
switch ( common_req->r_opcode & 0x7F ) { switch ( common_req->r_opcode & 0x7F ) {
case PCP_OPCODE_MAP: case PCP_OPCODE_MAP:
@ -1078,7 +1083,8 @@ static int processPCPRequest(void * req, int req_size, pcp_info_t *pcp_msg_info)
} }
} else if (common_req->ver == 2) { } else if (common_req->ver == 2) {
/* RFC 6887 PCP support
* http://tools.ietf.org/html/rfc6887 */
switch ( common_req->r_opcode & 0x7F) { switch ( common_req->r_opcode & 0x7F) {
case PCP_OPCODE_MAP: case PCP_OPCODE_MAP:
@ -1305,7 +1311,10 @@ int ProcessIncomingPCPPacket(int s, unsigned char *buff, int len,
createPCPResponse(buff, &pcp_msg_info); createPCPResponse(buff, &pcp_msg_info);
len = (len + 3) & ~3; /* round up resp. length to multiple of 4 */ if(len < PCP_MIN_LEN)
len = PCP_MIN_LEN;
else
len = (len + 3) & ~3; /* round up resp. length to multiple of 4 */
len = sendto(s, buff, len, 0, len = sendto(s, buff, len, 0,
(struct sockaddr *)senderaddr, sizeof(struct sockaddr_in)); (struct sockaddr *)senderaddr, sizeof(struct sockaddr_in));
if( len < 0 ) { if( len < 0 ) {