[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3079-g2285266

Tim Prouty tprouty at samba.org
Tue Oct 7 17:35:12 GMT 2008


The branch, v3-2-test has been updated
       via  22852666ddf3e77404373042ceecb19747ae25cd (commit)
       via  03cbea1d653c716b16347c831aa56dca0eb297ab (commit)
      from  84951b54bc1473aa9275c02cc37a9f0d7d4150e2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 22852666ddf3e77404373042ceecb19747ae25cd
Author: Tim Prouty <tim.prouty at isilon.com>
Date:   Tue Oct 7 10:30:22 2008 -0700

    Fixed build warning "passing arg from incompatible pointer type"
    
    The fix explicitly makes the conversion from timeval to time_t using the
    existing time utility functions.
    
    Compiling modules/vfs_smb_traffic_analyzer.c
    modules/vfs_smb_traffic_analyzer.c: In function `smb_traffic_analyzer_send_data':
    modules/vfs_smb_traffic_analyzer.c:173: warning: passing arg 1 of `localtime' from incompatible pointer type

commit 03cbea1d653c716b16347c831aa56dca0eb297ab
Author: Tim Prouty <tim.prouty at isilon.com>
Date:   Tue Oct 7 10:13:51 2008 -0700

    Fixed "declaration shadows global declaration" warnings.
    
    The patch simply uses a more descriptive variable name for tcp_seq.
    
    lib/socket_wrapper/socket_wrapper.c:753: warning: declaration of 'tcp_seq' shadows a global declaration
    /usr/include/netinet/tcp.h:40: warning: shadowed declaration is here
    lib/socket_wrapper/socket_wrapper.c: In function `swrap_marshall_packet':
    lib/socket_wrapper/socket_wrapper.c:919: warning: declaration of 'tcp_seq' shadows a global declaration
    /usr/include/netinet/tcp.h:40: warning: shadowed declaration is here

-----------------------------------------------------------------------

Summary of changes:
 source/lib/socket_wrapper/socket_wrapper.c |   38 ++++++++++++++--------------
 source/modules/vfs_smb_traffic_analyzer.c  |    4 ++-
 2 files changed, 22 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/socket_wrapper/socket_wrapper.c b/source/lib/socket_wrapper/socket_wrapper.c
index c0a7c16..ebb0639 100644
--- a/source/lib/socket_wrapper/socket_wrapper.c
+++ b/source/lib/socket_wrapper/socket_wrapper.c
@@ -625,7 +625,7 @@ static struct swrap_packet *swrap_packet_init(struct timeval *tval,
 					      int socket_type,
 					      const unsigned char *payload,
 					      size_t payload_len,
-					      unsigned long tcp_seq,
+					      unsigned long tcp_seqno,
 					      unsigned long tcp_ack,
 					      unsigned char tcp_ctl,
 					      int unreachable,
@@ -724,7 +724,7 @@ static struct swrap_packet *swrap_packet_init(struct timeval *tval,
 	case SOCK_STREAM:
 		packet->ip.p.tcp.source_port	= src_port;
 		packet->ip.p.tcp.dest_port	= dest_port;
-		packet->ip.p.tcp.seq_num	= htonl(tcp_seq);
+		packet->ip.p.tcp.seq_num	= htonl(tcp_seqno);
 		packet->ip.p.tcp.ack_num	= htonl(tcp_ack);
 		packet->ip.p.tcp.hdr_length	= 0x50; /* 5 * 32 bit words */
 		packet->ip.p.tcp.control	= tcp_ctl;
@@ -787,7 +787,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 	const struct sockaddr_in *src_addr;
 	const struct sockaddr_in *dest_addr;
 	const char *file_name;
-	unsigned long tcp_seq = 0;
+	unsigned long tcp_seqno = 0;
 	unsigned long tcp_ack = 0;
 	unsigned char tcp_ctl = 0;
 	int unreachable = 0;
@@ -812,7 +812,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		src_addr = (const struct sockaddr_in *)si->myname;
 		dest_addr = (const struct sockaddr_in *)addr;
 
-		tcp_seq = si->io.pck_snd;
+		tcp_seqno = si->io.pck_snd;
 		tcp_ack = si->io.pck_rcv;
 		tcp_ctl = 0x02; /* SYN */
 
@@ -826,7 +826,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		dest_addr = (const struct sockaddr_in *)si->myname;
 		src_addr = (const struct sockaddr_in *)addr;
 
-		tcp_seq = si->io.pck_rcv;
+		tcp_seqno = si->io.pck_rcv;
 		tcp_ack = si->io.pck_snd;
 		tcp_ctl = 0x12; /** SYN,ACK */
 
@@ -841,7 +841,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		src_addr = (const struct sockaddr_in *)addr;
 
 		/* Unreachable: resend the data of SWRAP_CONNECT_SEND */
-		tcp_seq = si->io.pck_snd - 1;
+		tcp_seqno = si->io.pck_snd - 1;
 		tcp_ack = si->io.pck_rcv;
 		tcp_ctl = 0x02; /* SYN */
 		unreachable = 1;
@@ -854,7 +854,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		src_addr = (const struct sockaddr_in *)si->myname;
 		dest_addr = (const struct sockaddr_in *)addr;
 
-		tcp_seq = si->io.pck_snd;
+		tcp_seqno = si->io.pck_snd;
 		tcp_ack = si->io.pck_rcv;
 		tcp_ctl = 0x10; /* ACK */
 
@@ -866,7 +866,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		dest_addr = (const struct sockaddr_in *)si->myname;
 		src_addr = (const struct sockaddr_in *)addr;
 
-		tcp_seq = si->io.pck_rcv;
+		tcp_seqno = si->io.pck_rcv;
 		tcp_ack = si->io.pck_snd;
 		tcp_ctl = 0x02; /* SYN */
 
@@ -880,7 +880,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		src_addr = (const struct sockaddr_in *)si->myname;
 		dest_addr = (const struct sockaddr_in *)addr;
 
-		tcp_seq = si->io.pck_snd;
+		tcp_seqno = si->io.pck_snd;
 		tcp_ack = si->io.pck_rcv;
 		tcp_ctl = 0x12; /* SYN,ACK */
 
@@ -894,7 +894,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		dest_addr = (const struct sockaddr_in *)si->myname;
 		src_addr = (const struct sockaddr_in *)addr;
 
-		tcp_seq = si->io.pck_rcv;
+		tcp_seqno = si->io.pck_rcv;
 		tcp_ack = si->io.pck_snd;
 		tcp_ctl = 0x10; /* ACK */
 
@@ -904,7 +904,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		src_addr = (const struct sockaddr_in *)si->myname;
 		dest_addr = (const struct sockaddr_in *)si->peername;
 
-		tcp_seq = si->io.pck_snd;
+		tcp_seqno = si->io.pck_snd;
 		tcp_ack = si->io.pck_rcv;
 		tcp_ctl = 0x18; /* PSH,ACK */
 
@@ -923,7 +923,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 			return;
 		}
 
-		tcp_seq = si->io.pck_rcv;
+		tcp_seqno = si->io.pck_rcv;
 		tcp_ack = si->io.pck_snd;
 		tcp_ctl = 0x14; /** RST,ACK */
 
@@ -937,7 +937,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 			return;
 		}
 
-		tcp_seq = si->io.pck_rcv;
+		tcp_seqno = si->io.pck_rcv;
 		tcp_ack = si->io.pck_snd;
 		tcp_ctl = 0x14; /* RST,ACK */
 
@@ -947,7 +947,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		dest_addr = (const struct sockaddr_in *)si->myname;
 		src_addr = (const struct sockaddr_in *)si->peername;
 
-		tcp_seq = si->io.pck_rcv;
+		tcp_seqno = si->io.pck_rcv;
 		tcp_ack = si->io.pck_snd;
 		tcp_ctl = 0x18; /* PSH,ACK */
 
@@ -963,7 +963,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 			return;
 		}
 
-		tcp_seq = si->io.pck_rcv;
+		tcp_seqno = si->io.pck_rcv;
 		tcp_ack = si->io.pck_snd;
 		tcp_ctl = 0x14; /* RST,ACK */
 
@@ -999,7 +999,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		src_addr = (const struct sockaddr_in *)si->myname;
 		dest_addr = (const struct sockaddr_in *)si->peername;
 
-		tcp_seq = si->io.pck_snd;
+		tcp_seqno = si->io.pck_snd;
 		tcp_ack = si->io.pck_rcv;
 		tcp_ctl = 0x11; /* FIN, ACK */
 
@@ -1013,7 +1013,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		dest_addr = (const struct sockaddr_in *)si->myname;
 		src_addr = (const struct sockaddr_in *)si->peername;
 
-		tcp_seq = si->io.pck_rcv;
+		tcp_seqno = si->io.pck_rcv;
 		tcp_ack = si->io.pck_snd;
 		tcp_ctl = 0x11; /* FIN,ACK */
 
@@ -1027,7 +1027,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 		src_addr = (const struct sockaddr_in *)si->myname;
 		dest_addr = (const struct sockaddr_in *)si->peername;
 
-		tcp_seq = si->io.pck_snd;
+		tcp_seqno = si->io.pck_snd;
 		tcp_ack = si->io.pck_rcv;
 		tcp_ctl = 0x10; /* ACK */
 
@@ -1040,7 +1040,7 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
 
 	packet = swrap_packet_init(&tv, src_addr, dest_addr, si->type,
 				   (const unsigned char *)buf, len,
-				   tcp_seq, tcp_ack, tcp_ctl, unreachable,
+				   tcp_seqno, tcp_ack, tcp_ctl, unreachable,
 				   &packet_len);
 	if (!packet) {
 		return;
diff --git a/source/modules/vfs_smb_traffic_analyzer.c b/source/modules/vfs_smb_traffic_analyzer.c
index 714df02..1402b7c 100644
--- a/source/modules/vfs_smb_traffic_analyzer.c
+++ b/source/modules/vfs_smb_traffic_analyzer.c
@@ -157,6 +157,7 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
 {
 	struct refcounted_sock *rf_sock = NULL;
 	struct timeval tv;
+	time_t tv_sec;
 	struct tm *tm = NULL;
 	int seconds;
 	char *str = NULL;
@@ -171,7 +172,8 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
 	}
 
 	GetTimeOfDay(&tv);
- 	tm=localtime(&tv.tv_sec);
+	tv_sec = convert_timespec_to_time_t(convert_timeval_to_timespec(tv));
+	tm = localtime(&tv_sec);
 	if (!tm) {
 		return;
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list