svn commit: samba r19136 - in
branches/SAMBA_4_0/source/lib/socket_wrapper: .
vlendec at samba.org
vlendec at samba.org
Fri Oct 6 15:16:20 GMT 2006
Author: vlendec
Date: 2006-10-06 15:16:18 +0000 (Fri, 06 Oct 2006)
New Revision: 19136
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19136
Log:
No conflict, after "svn up" it applied correctly", merge 19126 from 3_0
Modified:
branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c 2006-10-06 15:06:54 UTC (rev 19135)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c 2006-10-06 15:16:18 UTC (rev 19136)
@@ -587,11 +587,11 @@
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 @@
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) {
More information about the samba-cvs
mailing list