[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_4-4-g3b164f1

[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  3b164f18445460fbea124b77c87b02acc07cdfea (commit)
      from  993e7a9703821acc81a2a3dfe7cadd4d35197597 (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=3b164f18445460fbea124b77c87b02acc07cdfea


commit 3b164f18445460fbea124b77c87b02acc07cdfea
Author: Mats Erik Andersson <address@hidden>
Date:   Mon Jul 20 23:28:19 2015 +0200

    ifconfig: More info on tunnel interfaces.
    
    All formats display point-to-point destination.
    Display tunnel endpoints on BSD systems.

diff --git a/ChangeLog b/ChangeLog
index 822b6d2..c0780be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2015-07-20  Mats Erik Andersson  <address@hidden>
+
+       ifconfig: More info on tunnel interfaces.
+
+       * ifconfig/options.c (formats) <net-tools format>: Add
+       destination address for point-to-point interfaces.  It is
+       present in some other formats.
+       <unix format>: Display tunnel addresses for p-t-p interfaces.
+       <osf format>: Add destination address for p-t-p interfaces
+       and hardware type and hardware address for any device.
+
+       * ifconfig/system/bsd.c (system_fh_brdaddr_query): Check
+       that IFF_BROADCAST is set and access the relevant member
+       `fp->ifa_broadaddr'.
+       (system_fh_brdaddr): Check for set IFF_BROADCAST.
+       (system_fh_tunnel_query, system_fh_tundst, system_fh_tunsrc):
+       New functions.
+       * ifconfig/system/bsd.h (SYSTEM_FORMAT_HANDLER): Add the
+       keys `tunnel?', `tundst', and `tunsrc'.
+       (system_fh_tunnel_query, system_fh_tundst, system_fh_tunsrc):
+       New prototypes.
+
 2015-07-18  Mats Erik Andersson  <address@hidden>
 
        rcp: Integer overflow.
diff --git a/ifconfig/options.c b/ifconfig/options.c
index 3356f0e..2f20e75 100644
--- a/ifconfig/options.c
+++ b/ifconfig/options.c
@@ -102,6 +102,7 @@ struct format formats[] = {
    "${name}${exists?}{hwtype?}{${hwtype?}{${tab}{10}Link encap:${hwtype}}"
    "${hwaddr?}{  HWaddr ${hwaddr}}}${\\n}"
    "${addr?}{${tab}{10}inet addr:${addr}"
+   "${dstaddr?}{  P-t-P:${dstaddr}}"
    "${brdaddr?}{  Bcast:${brdaddr}}"
    "${netmask?}{  Mask:${netmask}}"
    "${newline}}"
@@ -164,6 +165,8 @@ struct format formats[] = {
    "${exists?}{hwtype?}{"
      "${hwtype?}{${\\t}${hwtype}${exists?}{hwaddr?}{"
        "${hwaddr?}{ ${hwaddr}}}${\\n}}}"
+   "${exists?}{tunnel?}{"
+     "${tunnel?}{${\\t}tunnel inet ${tunsrc} --> ${tundst}${\\n}}}"
    "${addr?}{${\\t}inet ${addr}"
    "${dstaddr?}{ --> ${dstaddr}}"
    " netmask ${netmask}{0}{%#02x}${netmask}{1}{%02x}"
@@ -180,9 +183,13 @@ struct format formats[] = {
    "${ifdisplay?}{"
    "${name}: flags=${flags}{number}{%x}<${flags}{string}{,}>${\\n}"
    "${addr?}{${\\t}inet ${addr}"
+   "${dstaddr?}{ --> ${dstaddr}}"
    " netmask ${netmask}{0}{%02x}${netmask}{1}{%02x}"
    "${netmask}{2}{%02x}${netmask}{3}{%02x}"
    "${brdaddr?}{ broadcast ${brdaddr}}" "${mtu?}{ ipmtu ${mtu}}${\\n}}"
+   "${exists?}{hwtype?}{"
+     "${hwtype?}{${\\t}${hwtype}${exists?}{hwaddr?}{"
+       "${hwaddr?}{ ${hwaddr}}}${\\n}}}"
    "}"
   },
   {"check",
diff --git a/ifconfig/system/bsd.c b/ifconfig/system/bsd.c
index 4746124..910a75e 100644
--- a/ifconfig/system/bsd.c
+++ b/ifconfig/system/bsd.c
@@ -217,7 +217,7 @@ system_fh_brdaddr_query (format_data_t form, int argc, char 
*argv[])
              strcmp (fp->ifa_name, form->ifr->ifr_name))
            continue;
 
-         if (fp->ifa_netmask)
+         if ((fp->ifa_flags & IFF_BROADCAST) && fp->ifa_broadaddr)
            missing = 0;
          break;
        }
@@ -242,7 +242,7 @@ system_fh_brdaddr (format_data_t form, int argc, char 
*argv[])
              strcmp (fp->ifa_name, form->ifr->ifr_name))
            continue;
 
-         if (fp->ifa_broadaddr)
+         if ((fp->ifa_flags & IFF_BROADCAST) && fp->ifa_broadaddr)
            {
              missing = 0;
              put_addr (form, argc, argv, fp->ifa_broadaddr);
@@ -588,3 +588,36 @@ system_fh_status (format_data_t form, int argc, char 
*argv[])
 #endif /* SIOCGIFMEDIA */
     put_string (form, "(not known)");
 }
+
+void
+system_fh_tunnel_query (format_data_t form, int argc, char *argv[])
+{
+#if defined SIOCGIFPSRCADDR && defined SIOCGIFPDSTADDR
+  if (ioctl (form->sfd, SIOCGIFPSRCADDR, form->ifr) >= 0)
+    select_arg (form, argc, argv, 0);
+  else
+#endif /* SIOCGIFPSRCADDR && SIOCGIFPDSTADDR */
+  select_arg (form, argc, argv, 1);
+}
+
+void
+system_fh_tundst (format_data_t form, int argc, char *argv[])
+{
+#ifdef SIOCGIFPDSTADDR
+  if (ioctl (form->sfd, SIOCGIFPDSTADDR, form->ifr) >= 0)
+    put_addr (form, argc, argv, &form->ifr->ifr_addr);
+  else
+    put_string (form, "(no phydst)");
+#endif /* SIOCGIFPDSTADDR */
+}
+
+void
+system_fh_tunsrc (format_data_t form, int argc, char *argv[])
+{
+#ifdef SIOCGIFPSRCADDR
+  if (ioctl (form->sfd, SIOCGIFPSRCADDR, form->ifr) >= 0)
+    put_addr (form, argc, argv, &form->ifr->ifr_addr);
+  else
+    put_string (form, "(no physrc)");
+#endif /* SIOCGIFPSRCADDR */
+}
diff --git a/ifconfig/system/bsd.h b/ifconfig/system/bsd.h
index 0b802a6..918c1f2 100644
--- a/ifconfig/system/bsd.h
+++ b/ifconfig/system/bsd.h
@@ -71,7 +71,10 @@ struct system_ifconfig
   {"netmask?", system_fh_netmask_query}, \
   {"netmask", system_fh_netmask},      \
   {"status?", system_fh_status_query}, \
-  {"status", system_fh_status},
+  {"status", system_fh_status}, \
+  {"tunnel?", system_fh_tunnel_query}, \
+  {"tundst", system_fh_tundst}, \
+  {"tunsrc", system_fh_tunsrc},
 
 void system_fh_brdaddr_query (format_data_t form, int argc, char *argv[]);
 void system_fh_brdaddr (format_data_t form, int argc, char *argv[]);
@@ -85,5 +88,8 @@ void system_fh_netmask_query (format_data_t form, int argc, 
char *argv[]);
 void system_fh_netmask (format_data_t form, int argc, char *argv[]);
 void system_fh_status_query (format_data_t form, int argc, char *argv[]);
 void system_fh_status (format_data_t form, int argc, char *argv[]);
+void system_fh_tunnel_query (format_data_t form, int argc, char *argv[]);
+void system_fh_tundst (format_data_t form, int argc, char *argv[]);
+void system_fh_tunsrc (format_data_t form, int argc, char *argv[]);
 
 #endif /* IFCONFIG_SYSTEM_BSD_H */

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

Summary of changes:
 ChangeLog             |   22 ++++++++++++++++++++++
 ifconfig/options.c    |    7 +++++++
 ifconfig/system/bsd.c |   37 +++++++++++++++++++++++++++++++++++--
 ifconfig/system/bsd.h |    8 +++++++-
 4 files changed, 71 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils