Author: tjansen Date: Mon Oct 12 11:34:06 2009 New Revision: 1086 Log: Removed unneccessary variable initializations. The copy functions in {c,s}dtun.c are essential for performance. Cleaning them up will probably benefit throughput. Modified: trunk/pisacd/cdtun.c trunk/pisasd/sdtun.c Modified: trunk/pisacd/cdtun.c ============================================================================== --- trunk/pisacd/cdtun.c Fri Oct 9 21:41:07 2009 (r1085) +++ trunk/pisacd/cdtun.c Mon Oct 12 11:34:06 2009 (r1086) @@ -31,9 +31,9 @@ void pisa_cd_copy_from_sock_to_tun(void) { char buffer[MAX_PACKET_BUFFER_TUN]; - ssize_t len = 0; - unsigned int addrlen = 0; - struct sockaddr_in6 from = {0}; + ssize_t len; + unsigned int addrlen; + struct sockaddr_in6 from; pisa_nat_mapping *map; struct iphdr *hdr; struct in_addr *srcaddr; @@ -88,13 +88,13 @@ void pisa_cd_copy_from_tun_to_sock(void) { char buffer[MAX_PACKET_BUFFER_TUN]; - ssize_t len = 0; + ssize_t len; struct iphdr *hdr; struct in_addr *dst; pisa_conmgr_entry *entry; pisa_nat_mapping *map; pisa_mac *mac = (pisa_mac *)buffer; - struct sockaddr_in6 addr = {0}; + struct sockaddr_in6 addr; if ((len = read(cd_ctx.tunnel, buffer + 6, sizeof(buffer) - 6)) < 0) { PISA_ERROR("local -> remote: read failed: %s\n", strerror(errno)); Modified: trunk/pisasd/sdtun.c ============================================================================== --- trunk/pisasd/sdtun.c Fri Oct 9 21:41:07 2009 (r1085) +++ trunk/pisasd/sdtun.c Mon Oct 12 11:34:06 2009 (r1086) @@ -58,9 +58,9 @@ void pisa_sd_copy_from_sock_to_tun(void) { char buffer[MAX_PACKET_BUFFER_TUN]; - ssize_t len = 0; - unsigned int addrlen = 0; - struct sockaddr_in6 from = {0}; + ssize_t len; + unsigned int addrlen; + struct sockaddr_in6 from; pisa_conmgr_entry *entry; pisa_nat_mapping *map; pisa_mac *mac = (pisa_mac *)buffer; @@ -150,12 +150,12 @@ void pisa_sd_copy_from_tun_to_sock(void) { char buffer[MAX_PACKET_BUFFER_TUN]; - ssize_t len = 0; + ssize_t len; struct iphdr *hdr; struct in_addr *dst; pisa_conmgr_entry *entry; pisa_nat_mapping *map; - struct sockaddr_in6 addr = {0}; + struct sockaddr_in6 addr; /* Clean the 6 MAC bytes at the head of the buffer. */ memset(buffer, 0, 6);