LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

[PATCH RFC 06/24] IPVS: Add debug macros for v4 and v6 address output

To: netdev@xxxxxxxxxxxxxxx, lvs-devel@xxxxxxxxxxxxxxx
Subject: [PATCH RFC 06/24] IPVS: Add debug macros for v4 and v6 address output
Cc: horms@xxxxxxxxxxxx, kaber@xxxxxxxxx, vbusam@xxxxxxxxxx, Julius Volz <juliusv@xxxxxxxxxx>
From: Julius Volz <juliusv@xxxxxxxxxx>
Date: Wed, 20 Aug 2008 18:15:13 +0200
Add some debugging macros that allow conditional output of either v4 or v6
addresses, depending on an 'af' parameter. This is done by creating a
temporary string buffer in an outer debug macro and writing addresses'
string representations into it from another macro which can only be used
when inside the outer one.

Signed-off-by: Julius Volz <juliusv@xxxxxxxxxx>

 1 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 016af19..82037b7 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -79,6 +79,47 @@ static inline int ip_vs_addr_equal(int af, const union 
nf_inet_addr *a,
 #include <linux/net.h>
 
 extern int ip_vs_get_debug_level(void);
+
+static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
+                                        const union nf_inet_addr *addr,
+                                        int *idx)
+{
+       int len;
+#ifdef CONFIG_IP_VS_IPV6
+       if (af == AF_INET)
+#endif
+               len = snprintf(&buf[*idx], buf_len - *idx, NIPQUAD_FMT,
+                              NIPQUAD(addr->ip)) + 1;
+#ifdef CONFIG_IP_VS_IPV6
+       else
+               len = snprintf(&buf[*idx], buf_len - *idx, "[" NIP6_FMT "]",
+                              NIP6(addr->in6)) + 1;
+#endif
+
+       *idx += len;
+       return &buf[*idx - len];
+}
+
+#define IP_VS_DBG_BUF(level, msg...)                   \
+    do {                                               \
+           char ip_vs_dbg_buf[160];                    \
+           int ip_vs_dbg_idx = 0;                      \
+           if (level <= ip_vs_get_debug_level())       \
+                   printk(KERN_DEBUG "IPVS: " msg);    \
+    } while (0)
+#define IP_VS_ERR_BUF(msg...)                          \
+    do {                                               \
+           char ip_vs_dbg_buf[160];                    \
+           int ip_vs_dbg_idx = 0;                      \
+           printk(KERN_ERR "IPVS: " msg);              \
+    } while (0)
+
+/* Only use from within IP_VS_DBG_BUF() macro */
+#define IP_VS_DBG_ADDR(af, addr)                       \
+    ip_vs_dbg_addr(af, ip_vs_dbg_buf,                  \
+                  sizeof(ip_vs_dbg_buf), addr,         \
+                  &ip_vs_dbg_idx)
+
 #define IP_VS_DBG(level, msg...)                       \
     do {                                               \
            if (level <= ip_vs_get_debug_level())       \
@@ -101,6 +142,8 @@ extern int ip_vs_get_debug_level(void);
                pp->debug_packet(pp, skb, ofs, msg);    \
     } while (0)
 #else  /* NO DEBUGGING at ALL */
+#define IP_VS_DBG_BUF(level, msg...)  do {} while (0)
+#define IP_VS_ERR_BUF(msg...)  do {} while (0)
 #define IP_VS_DBG(level, msg...)  do {} while (0)
 #define IP_VS_DBG_RL(msg...)  do {} while (0)
 #define IP_VS_DBG_PKT(level, pp, skb, ofs, msg)                do {} while (0)
-- 
1.5.4.5

--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

<Prev in Thread] Current Thread [Next in Thread>