remove unused macro

diff --git a/src/lib/io/app_io.c b/src/lib/io/app_io.c
index 50cd239cc300231d98a7ca9c318fa972555e95e2..40d2db0f6cdfd1a7d1a9df97d73728121950052c 100644 (file)
--- a/src/lib/io/app_io.c
+++ b/src/lib/io/app_io.c
@@ -29,7 +29,8 @@
 
 char const *fr_app_io_socket_name(TALLOC_CTX *ctx, fr_app_io_t const *app_io,
                                  fr_ipaddr_t const *src_ipaddr, int src_port,
-                                 fr_ipaddr_t const *dst_ipaddr, int dst_port)
+                                 fr_ipaddr_t const *dst_ipaddr, int dst_port,
+                                 char const *interface)
 {
        char                dst_buf[128], src_buf[128];
 
@@ -47,14 +48,25 @@ char const *fr_app_io_socket_name(TALLOC_CTX *ctx, fr_app_io_t const *app_io,
                fr_value_box_snprint(dst_buf, sizeof(dst_buf), fr_box_ipaddr(*dst_ipaddr), 0);
        }
 
-       if (!src_ipaddr) {
-               return talloc_typed_asprintf(ctx, "proto_%s server %s port %u",
-                                            app_io->name, dst_buf, dst_port);
+       if (src_ipaddr) fr_value_box_snprint(src_buf, sizeof(src_buf), fr_box_ipaddr(*src_ipaddr), 0);
+
+       if (!interface) {
+               if (!src_ipaddr) {
+                       return talloc_typed_asprintf(ctx, "proto_%s server %s port %u",
+                                                    app_io->name, dst_buf, dst_port);
+               }
+
+
+               return talloc_typed_asprintf(ctx, "proto_%s from client %s port %u to server %s port %u",
+                                            app_io->name, src_buf, src_port, dst_buf, dst_port);
        }
 
+       if (!src_ipaddr) {
+               return talloc_typed_asprintf(ctx, "proto_%s server %s port %u on interface %s",
+                                            app_io->name, dst_buf, dst_port, interface);
+               }
 
-       fr_value_box_snprint(src_buf, sizeof(src_buf), fr_box_ipaddr(*src_ipaddr), 0);
 
-       return talloc_typed_asprintf(ctx, "proto_%s from client %s port %u to server %s port %u",
-                                    app_io->name, src_buf, src_port, dst_buf, dst_port);
+               return talloc_typed_asprintf(ctx, "proto_%s from client %s port %u to server %s port %u on interface %s",
+                                            app_io->name, src_buf, src_port, dst_buf, dst_port, interface);
 }

diff --git a/src/lib/io/app_io.h b/src/lib/io/app_io.h
index 8589c72c3dfd32b7b5db93dd9061f48c3650c335..dd07268fd4f9ec636143c8fd62d761df62a757ed 100644 (file)
--- a/src/lib/io/app_io.h
+++ b/src/lib/io/app_io.h
@@ -78,4 +78,5 @@ typedef struct {
  */
 char const *fr_app_io_socket_name(TALLOC_CTX *ctx, fr_app_io_t const *app_io,
                                  fr_ipaddr_t const *src_ipaddr, int src_port,
-                                 fr_ipaddr_t const *dst_ipaddr, int dst_port);
+                                 fr_ipaddr_t const *dst_ipaddr, int dst_port,
+                                 char const *interface);

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index d076086df82ecab2f6abccd6e768856e702e30c5..c0c4933dec0636054abe5b5a12d6f7ff83ca0242 100644 (file)
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -48,7 +48,7 @@ RCSID("$Id$")
 #undef DEBUG3
 #undef ERROR
 
-#define DEBUG(fmt, ...) if (nr->lvl) fr_log(nr->log, L_DBG, fmt, ## __VA_ARGS__)
+//#define DEBUG(fmt, ...) if (nr->lvl) fr_log(nr->log, L_DBG, fmt, ## __VA_ARGS__)
 //#define DEBUG2(fmt, ...) if (nr->lvl >= L_DBG_LVL_2) fr_log(nr->log, L_DBG, fmt, ## __VA_ARGS__)
 #define DEBUG3(fmt, ...) if (nr->lvl >= L_DBG_LVL_3) fr_log(nr->log, L_DBG, fmt, ## __VA_ARGS__)
 #define ERROR(fmt, ...) fr_log(nr->log, L_ERR, fmt, ## __VA_ARGS__)