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

miniupnpd/pcpserver.c: Removed IPV6_ADDR_COPY and other simplifications

This commit is contained in:
Thomas Bernard 2013-12-16 17:04:00 +01:00
parent fa87b3aff7
commit e23c589972
2 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
miniupnpd/pcp_msg_struct.h
View File

@ -1,4 +1,4 @@
/* $Id: pcp_msg_struct.h,v 1.2 2013/12/13 15:47:23 nanard Exp $ */ /* $Id: pcp_msg_struct.h,v 1.3 2013/12/16 16:02:19 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* Website : http://miniupnp.free.fr/ * Website : http://miniupnp.free.fr/
* Author : Peter Tatrai * Author : Peter Tatrai
@ -148,7 +148,7 @@ typedef struct pcp_request {
uint8_t r_opcode; uint8_t r_opcode;
uint16_t reserved; uint16_t reserved;
uint32_t req_lifetime; uint32_t req_lifetime;
uint32_t ip[4]; /* ipv4 will be represented struct in6_addr ip; /* ipv4 will be represented
by the ipv4 mapped ipv6 */ by the ipv4 mapped ipv6 */
uint8_t next_data[0]; uint8_t next_data[0];
} pcp_request_t; } pcp_request_t;
@ -182,7 +182,7 @@ typedef struct pcp_map_v2 {
uint8_t reserved[3]; uint8_t reserved[3];
uint16_t int_port; uint16_t int_port;
uint16_t ext_port; uint16_t ext_port;
uint32_t ext_ip[4]; /* ipv4 will be represented struct in6_addr ext_ip; /* ipv4 will be represented
by the ipv4 mapped ipv6 */ by the ipv4 mapped ipv6 */
uint8_t next_data[0]; uint8_t next_data[0];
} pcp_map_v2_t; } pcp_map_v2_t;
@ -193,7 +193,7 @@ typedef struct pcp_map_v1 {
uint8_t reserved[3]; uint8_t reserved[3];
uint16_t int_port; uint16_t int_port;
uint16_t ext_port; uint16_t ext_port;
uint32_t ext_ip[4]; /* ipv4 will be represented struct in6_addr ext_ip; /* ipv4 will be represented
by the ipv4 mapped ipv6 */ by the ipv4 mapped ipv6 */
uint8_t next_data[0]; uint8_t next_data[0];
} pcp_map_v1_t; } pcp_map_v1_t;
@ -204,11 +204,11 @@ typedef struct pcp_peer_v1 {
uint8_t reserved[3]; uint8_t reserved[3];
uint16_t int_port; uint16_t int_port;
uint16_t ext_port; uint16_t ext_port;
uint32_t ext_ip[4]; /* ipv4 will be represented struct in6_addr ext_ip; /* ipv4 will be represented
by the ipv4 mapped ipv6 */ by the ipv4 mapped ipv6 */
uint16_t peer_port; uint16_t peer_port;
uint16_t reserved1; uint16_t reserved1;
uint32_t peer_ip[4]; struct in6_addr peer_ip;
uint8_t next_data[0]; uint8_t next_data[0];
} pcp_peer_v1_t; } pcp_peer_v1_t;
@ -219,11 +219,11 @@ typedef struct pcp_peer_v2 {
uint8_t reserved[3]; uint8_t reserved[3];
uint16_t int_port; uint16_t int_port;
uint16_t ext_port; uint16_t ext_port;
uint32_t ext_ip[4]; /* ipv4 will be represented struct in6_addr ext_ip; /* ipv4 will be represented
by the ipv4 mapped ipv6 */ by the ipv4 mapped ipv6 */
uint16_t peer_port; uint16_t peer_port;
uint16_t reserved1; uint16_t reserved1;
uint32_t peer_ip[4]; struct in6_addr peer_ip;
uint8_t next_data[0]; uint8_t next_data[0];
} pcp_peer_v2_t; } pcp_peer_v2_t;
@ -254,7 +254,7 @@ typedef struct pcp_3rd_party_option{
uint8_t option; uint8_t option;
uint8_t reserved; uint8_t reserved;
uint16_t len; uint16_t len;
uint32_t ip[4]; struct in6_addr ip;
uint8_t next_data[0]; uint8_t next_data[0];
} pcp_3rd_party_option_t; } pcp_3rd_party_option_t;
@ -280,7 +280,7 @@ typedef struct pcp_filter_option {
uint8_t reserved2; uint8_t reserved2;
uint8_t prefix_len; uint8_t prefix_len;
uint16_t peer_port; uint16_t peer_port;
uint32_t peer_ip[4]; struct in6_addr peer_ip;
}pcp_filter_option_t; }pcp_filter_option_t;
#pragma pack(pop) #pragma pack(pop)

36
miniupnpd/pcpserver.c
View File

@ -1,4 +1,4 @@
/* $Id: pcpserver.c,v 1.2 2013/12/13 15:48:56 nanard Exp $ */ /* $Id: pcpserver.c,v 1.4 2013/12/16 16:02:19 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* Website : http://miniupnp.free.fr/ * Website : http://miniupnp.free.fr/
* Author : Peter Tatrai * Author : Peter Tatrai
@ -65,19 +65,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "netfilter/iptcrdr.h" #include "netfilter/iptcrdr.h"
#endif #endif
#define IPV6_ADDR_COPY(dest, src) \
do { \
(dest)[0] = (src)[0]; \
(dest)[1] = (src)[1]; \
(dest)[2] = (src)[2]; \
(dest)[3] = (src)[3]; \
} while (0)
typedef struct options_occur {
int third_party_occur;
int pfailure_occur;
} options_occur_t;
/* server specific information */ /* server specific information */
struct pcp_server_info { struct pcp_server_info {
uint8_t server_version; uint8_t server_version;
@ -191,7 +178,7 @@ static int parseCommonRequestHeader(pcp_request_t *common_req, pcp_info_t *pcp_m
pcp_msg_info->version = common_req->ver ; pcp_msg_info->version = common_req->ver ;
pcp_msg_info->opcode = common_req->r_opcode &0x7f ; pcp_msg_info->opcode = common_req->r_opcode &0x7f ;
pcp_msg_info->lifetime = ntohl(common_req->req_lifetime); pcp_msg_info->lifetime = ntohl(common_req->req_lifetime);
pcp_msg_info->int_ip = (struct in6_addr*)common_req->ip; pcp_msg_info->int_ip = &common_req->ip;
if ( (common_req->ver > this_server_info.server_version) ) { if ( (common_req->ver > this_server_info.server_version) ) {
@ -219,7 +206,7 @@ static void printMAPOpcodeVersion1(pcp_map_v1_t *map_buf)
syslog(LOG_DEBUG, "MAP int port: \t\t %d\n", ntohs(map_buf->int_port) ); syslog(LOG_DEBUG, "MAP int port: \t\t %d\n", ntohs(map_buf->int_port) );
syslog(LOG_DEBUG, "MAP ext port: \t\t %d\n", ntohs(map_buf->ext_port) ); syslog(LOG_DEBUG, "MAP ext port: \t\t %d\n", ntohs(map_buf->ext_port) );
syslog(LOG_DEBUG, "MAP Ext IP: \t\t %s\n", inet_ntop(AF_INET6, syslog(LOG_DEBUG, "MAP Ext IP: \t\t %s\n", inet_ntop(AF_INET6,
map_buf->ext_ip, map_addr, INET6_ADDRSTRLEN)); &map_buf->ext_ip, map_addr, INET6_ADDRSTRLEN));
} }
static void printMAPOpcodeVersion2(pcp_map_v2_t *map_buf) static void printMAPOpcodeVersion2(pcp_map_v2_t *map_buf)
@ -230,7 +217,7 @@ static void printMAPOpcodeVersion2(pcp_map_v2_t *map_buf)
syslog(LOG_DEBUG, "MAP int port: \t\t %d\n", ntohs(map_buf->int_port) ); syslog(LOG_DEBUG, "MAP int port: \t\t %d\n", ntohs(map_buf->int_port) );
syslog(LOG_DEBUG, "MAP ext port: \t\t %d\n", ntohs(map_buf->ext_port) ); syslog(LOG_DEBUG, "MAP ext port: \t\t %d\n", ntohs(map_buf->ext_port) );
syslog(LOG_DEBUG, "MAP Ext IP: \t\t %s\n", inet_ntop(AF_INET6, syslog(LOG_DEBUG, "MAP Ext IP: \t\t %s\n", inet_ntop(AF_INET6,
map_buf->ext_ip, map_addr, INET6_ADDRSTRLEN)); &map_buf->ext_ip, map_addr, INET6_ADDRSTRLEN));
} }
#endif /* DEBUG */ #endif /* DEBUG */
@ -242,7 +229,7 @@ static int parsePCPMAP_version1(pcp_map_v1_t *map_v1, \
pcp_msg_info->int_port = ntohs(map_v1->int_port); pcp_msg_info->int_port = ntohs(map_v1->int_port);
pcp_msg_info->ext_port = ntohs(map_v1->ext_port); pcp_msg_info->ext_port = ntohs(map_v1->ext_port);
pcp_msg_info->ext_ip = (struct in6_addr*)map_v1->ext_ip; pcp_msg_info->ext_ip = &(map_v1->ext_ip);
if (pcp_msg_info->protocol == 0 && pcp_msg_info->int_port !=0 ){ if (pcp_msg_info->protocol == 0 && pcp_msg_info->int_port !=0 ){
syslog(LOG_ERR, "PCP MAP: Protocol was ZERO, but internal port has non-ZERO value."); syslog(LOG_ERR, "PCP MAP: Protocol was ZERO, but internal port has non-ZERO value.");
@ -260,7 +247,7 @@ static int parsePCPMAP_version2(pcp_map_v2_t *map_v2, \
pcp_msg_info->int_port = ntohs(map_v2->int_port); pcp_msg_info->int_port = ntohs(map_v2->int_port);
pcp_msg_info->ext_port = ntohs(map_v2->ext_port); pcp_msg_info->ext_port = ntohs(map_v2->ext_port);
pcp_msg_info->ext_ip = (struct in6_addr*)map_v2->ext_ip; pcp_msg_info->ext_ip = &(map_v2->ext_ip);
if (pcp_msg_info->protocol == 0 && pcp_msg_info->int_port !=0 ) { if (pcp_msg_info->protocol == 0 && pcp_msg_info->int_port !=0 ) {
syslog(LOG_ERR, "PCP MAP: Protocol was ZERO, but internal port has non-ZERO value."); syslog(LOG_ERR, "PCP MAP: Protocol was ZERO, but internal port has non-ZERO value.");
@ -436,7 +423,7 @@ static int parsePCPOptions(void* pcp_buf, int* remainingSize, int* processedSize
#ifdef DEBUG #ifdef DEBUG
syslog(LOG_DEBUG, "PCP OPTION: \t Third party \n"); syslog(LOG_DEBUG, "PCP OPTION: \t Third party \n");
syslog(LOG_DEBUG, "Third PARTY IP: \t %s\n", inet_ntop(AF_INET6, syslog(LOG_DEBUG, "Third PARTY IP: \t %s\n", inet_ntop(AF_INET6,
opt_3rd->ip, third_addr, INET6_ADDRSTRLEN)); &(opt_3rd->ip), third_addr, INET6_ADDRSTRLEN));
#endif #endif
if (pcp_msg_info->thirdp_present != 0 ) { if (pcp_msg_info->thirdp_present != 0 ) {
@ -616,8 +603,7 @@ static void FillSA(struct sockaddr *sa, const struct in6_addr *in6,
} else { } else {
struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa; struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa;
sa6->sin6_family = AF_INET6; sa6->sin6_family = AF_INET6;
IPV6_ADDR_COPY((uint32_t*)sa6->sin6_addr.s6_addr, sa6->sin6_addr = *in6;
(uint32_t*)in6->s6_addr);
sa6->sin6_port = htons(port); sa6->sin6_port = htons(port);
} }
} }
@ -1254,15 +1240,13 @@ static void createPCPResponse(unsigned char *response, pcp_info_t *pcp_msg_info)
if (resp->r_opcode == 0x81) { /* MAP response */ if (resp->r_opcode == 0x81) { /* MAP response */
if (resp->ver == 1 ) { if (resp->ver == 1 ) {
pcp_map_v1_t *mapr = (pcp_map_v1_t *)resp->next_data; pcp_map_v1_t *mapr = (pcp_map_v1_t *)resp->next_data;
IPV6_ADDR_COPY((uint32_t*)mapr->ext_ip, mapr->ext_ip = *pcp_msg_info->ext_ip;
(uint32_t*)pcp_msg_info->ext_ip);
mapr->ext_port = htons(pcp_msg_info->ext_port); mapr->ext_port = htons(pcp_msg_info->ext_port);
mapr->int_port = htons(pcp_msg_info->int_port); mapr->int_port = htons(pcp_msg_info->int_port);
} }
else if (resp->ver == 2 ) { else if (resp->ver == 2 ) {
pcp_map_v2_t *mapr = (pcp_map_v2_t *)resp->next_data; pcp_map_v2_t *mapr = (pcp_map_v2_t *)resp->next_data;
IPV6_ADDR_COPY((uint32_t*)mapr->ext_ip, mapr->ext_ip = *pcp_msg_info->ext_ip;
(uint32_t*)pcp_msg_info->ext_ip);
mapr->ext_port = htons(pcp_msg_info->ext_port); mapr->ext_port = htons(pcp_msg_info->ext_port);
mapr->int_port = htons(pcp_msg_info->int_port); mapr->int_port = htons(pcp_msg_info->int_port);
} }