[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-82-g1534341

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  153434103dc0b365bd1d187a2c72d2e4a62a27a8 (commit)
      from  32ef5496304612223b50cffcd4c639544201b4e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=153434103dc0b365bd1d187a2c72d2e4a62a27a8


commit 153434103dc0b365bd1d187a2c72d2e4a62a27a8
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Apr 27 01:50:13 2012 +0200

    ping: Payload adjustment.

diff --git a/ChangeLog b/ChangeLog
index 5dec85a..c9c12dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-27  Mats Erik Andersson  <address@hidden>
+
+       * ping/ping_address.c (print_address): Remove duplicate
+       prototype.  Print additional newline to conform with output
+       formatting for other types of reporting.
+       * ping/ping_echo.c (ping_echo)
+       [(options & OPT_ROUTE) & IP_OPTIONS]: Increase data length
+       to accomodate the amount used for record routes in IP header.
+
 2012-04-24  Mats Erik Andersson  <address@hidden>
 
        rexec: Read password from stdin.
diff --git a/ping/ping_address.c b/ping/ping_address.c
index 04574d7..fedc82f 100644
--- a/ping/ping_address.c
+++ b/ping/ping_address.c
@@ -50,9 +50,6 @@ static int recv_address (int code, void *closure,
 static void print_address (int dupflag, void *closure,
                           struct sockaddr_in *dest, struct sockaddr_in *from,
                           struct ip *ip, icmphdr_t * icmp, int datalen);
-static void print_address (int dupflag, void *closure,
-                          struct sockaddr_in *dest, struct sockaddr_in *from,
-                          struct ip *ip, icmphdr_t * icmp, int datalen);
 static int address_finish (void);
 
 int
@@ -103,6 +100,7 @@ print_address (int dupflag, void *closure,
          icmp->icmp_seq);
   if (dupflag)
     printf (" (DUP!)");
+  printf ("\n");
   addr.s_addr = icmp->icmp_mask;
   printf ("icmp_mask = %s", inet_ntoa (addr));
   printf ("\n");
diff --git a/ping/ping_echo.c b/ping/ping_echo.c
index 0278e35..f62582b 100644
--- a/ping/ping_echo.c
+++ b/ping/ping_echo.c
@@ -95,6 +95,8 @@ ping_echo (char *hostname)
       if (setsockopt (ping->ping_fd, IPPROTO_IP,
                      IP_OPTIONS, rspace, sizeof (rspace)) < 0)
         error (EXIT_FAILURE, errno, "setsockopt");
+      /* The encapsulating IP header is now augmented with options.  */
+      ping_set_packetsize (ping, data_length + sizeof (rspace));
 #else
       error (EXIT_FAILURE, 0, "record route not available in this "
              "implementation.");

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

Summary of changes:
 ChangeLog           |    9 +++++++++
 ping/ping_address.c |    4 +---
 ping/ping_echo.c    |    2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils