|
Hey
On 8/29/14 3:32 AM, Julian Anastasov wrote:
Hello,
On Fri, 29 Aug 2014, Alex Gartrell wrote:
From: Julian Anastasov <ja@xxxxxx>
Use the new address family field cp->daf when printing
cp->daddr in logs or connection listing.
Signed-off-by: Julian Anastasov <ja@xxxxxx>
Signed-off-by: Alex Gartrell <agartrell@xxxxxx>
...
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -27,6 +27,7 @@
#include <linux/interrupt.h>
#include <linux/in.h>
+#include <linux/inet.h>
#include <linux/net.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -77,6 +78,13 @@ static unsigned int ip_vs_conn_rnd __read_mostly;
#define CT_LOCKARRAY_SIZE (1<<CT_LOCKARRAY_BITS)
#define CT_LOCKARRAY_MASK (CT_LOCKARRAY_SIZE-1)
+/* We need an addrstrlen that works with or without v6 */
+#ifdef CONFIG_IP_VS_IPV6
+#define IP_VS_ADDRSTRLEN INET6_ADDRSTRLEN
+#else
+#define IP_VS_ADDRSTRLEN INET_ADDRSTRLEN
+#endif
Thanks! Note that for v4 we use 8+1 (hex).
All other patches look ok. It is early to ack them,
right? We need to post them again at the right time.
I hope "ipvs: properly declare tunnel encapsulation"
will be moved further soon.
I updated this patch
-#define IP_VS_ADDRSTRLEN INET_ADDRSTRLEN
+#define IP_VS_ADDRSTRLEN (8+1)
I'll spare the mailing list another 20 emails though.
So, if I understand correctly, we'll wait until it lands in net-next and
then I'll submit these patches to netdev?
For now we have to find a way to support sync
protocol and to update ipvsadm.
I'll mail the ipvsadm change right away. I haven't begun to think about
sync protocol though :)
Thanks,
Alex
--
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
|
