[Git][NTPsec/ntpsec][master] 2 commits: Exile recv_srcaddr_len out of the paylaod structure.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
5c9ab6fa by Eric S. Raymond at 2015-12-05T09:25:58Z
Exile recv_srcaddr_len out of the paylaod structure.

Also, correct its spelling in the Windows port tree.  Should have
happened in "And another persistent spelling error: dstadr ->
dstaddr."

- - - - -
017f280d by Eric S. Raymond at 2015-12-05T10:41:35Z
Remove unused msgflags field from payload structure.

- - - - -


3 changed files:

- include/recvbuff.h
- ntpd/ntp_io.c
- ports/winnt/ntpd/ntp_iocompletionport.c


Changes:

=====================================
include/recvbuff.h
=====================================
--- a/include/recvbuff.h
+++ b/include/recvbuff.h
@@ -53,12 +53,8 @@ struct payload {
 #define recv_srcaddr		X_from_where.X_recv_srcaddr
 #define	recv_srcclock		X_from_where.X_recv_srcclock
 #define recv_peer		X_from_where.X_recv_peer
-#ifdef HAVE_IO_COMPLETION_PORT
-	int		recv_srcaddr_len;/* filled in on completion */
-#endif
 	endpt *		dstaddr;		/* address pkt arrived on */
 	SOCKET		fd;		/* fd on which it was received */
-	int		msg_flags;	/* Flags received about the packet */
 	l_fp		recv_time;	/* time of arrival */
 	size_t		recv_length;	/* number of octets received */
 	union {
@@ -74,6 +70,9 @@ typedef struct recvbuf recvbuf_t;
 struct recvbuf {
 	recvbuf_t *	link;	/* next in list */
 	struct payload	payload;
+#ifdef HAVE_IO_COMPLETION_PORT
+	int		recv_srcaddr_len;/* filled in on completion */
+#endif
 	void		(*receiver)(struct payload *); /* callback */
 	int		used;		/* reference count */
 };


=====================================
ntpd/ntp_io.c
=====================================
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -3486,7 +3486,6 @@ read_network_packet(
 	msghdr.msg_iovlen     = 1;
 	msghdr.msg_control    = (void *)&control;
 	msghdr.msg_controllen = sizeof(control);
-	msghdr.msg_flags      = 0;
 	rb->payload.recv_length       = recvmsg(fd, &msghdr, 0);
 #endif
 


=====================================
ports/winnt/ntpd/ntp_iocompletionport.c
=====================================
--- a/ports/winnt/ntpd/ntp_iocompletionport.c
+++ b/ports/winnt/ntpd/ntp_iocompletionport.c
@@ -1370,12 +1370,12 @@ QueueSocketRecv(
 
 	Flags = 0;
 	buff->fd = s;
-	buff->recv_srcadr_len = sizeof(buff->recv_srcadr);
+	buff->recv_srcaddr_len = sizeof(buff->recv_srcadr);
 	wsabuf.buf = (char *)buff->recv_buffer;
 	wsabuf.len = sizeof(buff->recv_buffer);
 
 	rc = WSARecvFrom(buff->fd, &wsabuf, 1, NULL, &Flags, 
-			 &buff->recv_srcadr.sa, &buff->recv_srcadr_len, 
+			 &buff->recv_srcadr.sa, &buff->recv_srcaddr_len, 
 			 &lpo->ol, NULL);
 	if (SOCKET_ERROR == rc) 
 		return IoResultCheck(GetLastError(), lpo,
@@ -1431,7 +1431,7 @@ OnSocketRecv(
 	 * If we keep it add some info to the structure
 	 */
 	if (buff->recv_length && !inter->ignore_packets) {
-		NTP_INSIST(buff->recv_srcadr_len <=
+		NTP_INSIST(buff->recv_srcaddr_len <=
 			   sizeof(buff->recv_srcadr));
 		buff->receiver = &receive; 
 		buff->dstadr   = inter;



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/175b58dc0dd11493de4a337d4ebcf011c16fc59c...017f280d97cc0f262f8f2054a50bc5eb45cd74ac
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20151205/9675da38/attachment.html>