svn commit: r277562 - head/sbin/ping

[Andrey V. Elsukov]

Author: ae
Date: Fri Jan 23 13:26:35 2015
New Revision: 277562
URL: https://svnweb.freebsd.org/changeset/base/277562

Log:
  After r270929 RAW IP code assumes that all IP fields are in network
  byte order. Fix ping(8) to pass an IP header with converted ip_off
  and ip_len fields, when IP_HDRINCL socket option used.

Modified:
  head/sbin/ping/ping.c

Modified: head/sbin/ping/ping.c
==============================================================================
--- head/sbin/ping/ping.c	Fri Jan 23 07:36:51 2015	(r277561)
+++ head/sbin/ping/ping.c	Fri Jan 23 13:26:35 2015	(r277562)
@@ -713,7 +713,7 @@ main(int argc, char *const *argv)
 		ip->ip_hl = sizeof(struct ip) >> 2;
 		ip->ip_tos = tos;
 		ip->ip_id = 0;
-		ip->ip_off = df ? IP_DF : 0;
+		ip->ip_off = htons(df ? IP_DF : 0);
 		ip->ip_ttl = ttl;
 		ip->ip_p = IPPROTO_ICMP;
 		ip->ip_src.s_addr = source ? sock_in.sin_addr.s_addr : INADDR_ANY;
@@ -1078,7 +1078,7 @@ pinger(void)
 	if (options & F_HDRINCL) {
 		cc += sizeof(struct ip);
 		ip = (struct ip *)outpackhdr;
-		ip->ip_len = cc;
+		ip->ip_len = htons(cc);
 		ip->ip_sum = in_cksum((u_short *)outpackhdr, cc);
 		packet = outpackhdr;
 	}