ident.c, yaid.c, yaid.h: Make `get_default_gw' be internal to `ident.c'.

Don't really need the diagnostics any more.

diff --git a/ident.c b/ident.c
index ae3cf13339f471653e8fe44be8f8079b18997fa9..91c03aac4529155597785199fcb7a691deef88a6 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -85,7 +85,7 @@ static int sockeq(const struct addrfamily *af,
                  const struct socket *sa, const struct socket *sb)
   { return (af->addreq(&sa->addr, &sb->addr) && sa->port == sb->port); }
 
-int get_default_gw(int af, union addr *a)
+static int get_default_gw(int af, union addr *a)
 {
   int fd;
   char buf[32768];

diff --git a/yaid.c b/yaid.c
index affa5220b17a344a5b980cd9015fda4f86018fd3..4bb44fdacc8327aae7d132bfecfd1e32f39dbd7d 100644 (file)
--- a/yaid.c
+++ b/yaid.c
@@ -668,8 +668,6 @@ static int make_listening_socket(int af, int port, const char *proto)
 int main(int argc, char *argv[])
 {
   int port = 113;
-  char buf[ADDRLEN];
-  union addr a;
 
   ego(argv[0]);
 
@@ -686,11 +684,6 @@ int main(int argc, char *argv[])
        strerror(errno));
   }
 
-  if (get_default_gw(AF_INET, &a))
-    printf("ipv4 gw = %s\n", inet_ntop(AF_INET, &a, buf, sizeof(buf)));
-  if (get_default_gw(AF_INET6, &a))
-    printf("ipv6 gw = %s\n", inet_ntop(AF_INET6, &a, buf, sizeof(buf)));
-
   sel_init(&sel);
   if (make_listening_socket(AF_INET, port, "IPv4") &&
       make_listening_socket(AF_INET6, port, "IPv6"))

diff --git a/yaid.h b/yaid.h
index d8215da50e360adf89b562e53f01a53b82c4b1bb..e0d13c12acba96abe8df16122463a0549608d3eb 100644 (file)
--- a/yaid.h
+++ b/yaid.h
@@ -192,7 +192,6 @@ DA_DECL(policy_v, struct policy);
 void logmsg(const struct query *q, int prio, const char *msg, ...);
 
 void identify(struct query *q);
-int get_default_gw(int af, union addr *a);
 
 void init_policy(struct policy *p);
 void free_policy(struct policy *p);