summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-10-06 15:16:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:20:38 -0500
commit59b6b665d6f043bc372ab868e0ecd8ad4da5f2ef (patch)
tree1a0516da5e5d477d1f0a9e19cd85f89d5c985ba5
parent109bf77ea3e96d255e74aa7c5dfbaf131a625452 (diff)
downloadsamba-59b6b665d6f043bc372ab868e0ecd8ad4da5f2ef.tar.gz
samba-59b6b665d6f043bc372ab868e0ecd8ad4da5f2ef.tar.bz2
samba-59b6b665d6f043bc372ab868e0ecd8ad4da5f2ef.zip
r19136: No conflict, after "svn up" it applied correctly", merge 19126 from 3_0
(This used to be commit 042a22b6dd34bb147cf4f8cc10f98d4cda3ccd55)
-rw-r--r--source4/lib/socket_wrapper/socket_wrapper.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/lib/socket_wrapper/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c
index 006aba1e9d..9915789f0b 100644
--- a/source4/lib/socket_wrapper/socket_wrapper.c
+++ b/source4/lib/socket_wrapper/socket_wrapper.c
@@ -587,11 +587,11 @@ static struct swrap_packet *swrap_packet_init(struct timeval *tval,
size_t packet_len;
size_t alloc_len;
size_t nonwire_len = sizeof(packet->frame);
- size_t wire_hdr_len;
- size_t wire_len;
+ size_t wire_hdr_len = 0;
+ size_t wire_len = 0;
size_t icmp_hdr_len = 0;
size_t icmp_truncate_len = 0;
- unsigned char protocol, icmp_protocol;
+ unsigned char protocol = 0, icmp_protocol = 0;
unsigned short src_port = src_addr->sin_port;
unsigned short dest_port = dest_addr->sin_port;
@@ -983,11 +983,14 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
tcp_ctl = 0x10; /* ACK */
break;
+ default:
+ return;
}
swrapGetTimeOfDay(&tv);
- packet = swrap_packet_init(&tv, src_addr, dest_addr, si->type, buf, len,
+ packet = swrap_packet_init(&tv, src_addr, dest_addr, si->type,
+ (const unsigned char *)buf, len,
tcp_seq, tcp_ack, tcp_ctl, unreachable,
&packet_len);
if (!packet) {