From 2fa65e1fffa4b35a7f08d2fe65adea08acdfa2c2 Mon Sep 17 00:00:00 2001 From: rd235 Date: Wed, 5 Dec 2007 14:02:51 +0000 Subject: [PATCH] changed IPN_SWITCH->IPN_VDESWITCH git-svn-id: https://vde.svn.sourceforge.net/svnroot/vde/trunk@213 d37a7db1-d92d-0410-89df-f68f52f87b57 --- ipn/af_ipn.h | 4 ++-- ipn/kvde_switch/kvde_switch_main.c | 4 ++-- ipn/test/test0.c | 4 ++-- ipn/test/test0n.c | 6 +++--- ipn/test/test0x.c | 4 ++-- ipn/test/test1.c | 4 ++-- ipn/test/test1x.c | 4 ++-- ipn/test/test2.c | 6 +++--- ipn/test/test3.c | 4 ++-- ipn/test/test4.c | 6 +++--- ipn/test/test4x.c | 6 +++--- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ipn/af_ipn.h b/ipn/af_ipn.h index 9264bbf..885a0f4 100644 --- a/ipn/af_ipn.h +++ b/ipn/af_ipn.h @@ -8,8 +8,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 #define IPN_SO_PREBIND 0x80 #define IPN_SO_PORT 0 diff --git a/ipn/kvde_switch/kvde_switch_main.c b/ipn/kvde_switch/kvde_switch_main.c index 2c13fbc..40bed89 100644 --- a/ipn/kvde_switch/kvde_switch_main.c +++ b/ipn/kvde_switch/kvde_switch_main.c @@ -97,14 +97,14 @@ static int kvde_switch_init(void) rc=-ENOMEM; goto out; } - rc=ipn_proto_register(IPN_SWITCH,&vde_switch_proto); + rc=ipn_proto_register(IPN_VDESWITCH,&vde_switch_proto); out: return rc; } static void kvde_switch_exit(void) { - ipn_proto_deregister(IPN_SWITCH); + ipn_proto_deregister(IPN_VDESWITCH); if(kvde_net_cache) kmem_cache_destroy(kvde_net_cache); } diff --git a/ipn/test/test0.c b/ipn/test/test0.c index a8749eb..698b38f 100644 --- a/ipn/test/test0.c +++ b/ipn/test/test0.c @@ -9,8 +9,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 #define IPN_SO_PREBIND 0x80 #define IPN_SO_PORT 0 diff --git a/ipn/test/test0n.c b/ipn/test/test0n.c index dd0aaac..2788ce1 100644 --- a/ipn/test/test0n.c +++ b/ipn/test/test0n.c @@ -9,8 +9,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 #define IPN_SO_PREBIND 0x80 #define IPN_SO_PORT 0 @@ -32,7 +32,7 @@ struct sockaddr_un sun={.sun_family=AF_IPN,.sun_path="/tmp/sockipn"}; main() { //int s=socket(AF_IPN,SOCK_RAW,IPN_BROADCAST); - int s=socket(AF_IPN,SOCK_RAW,IPN_SWITCH); + int s=socket(AF_IPN,SOCK_RAW,IPN_VDESWITCH); int err; int len; int flags=IPN_FLAG_LOSSLESS; diff --git a/ipn/test/test0x.c b/ipn/test/test0x.c index c056eb9..cb3e81f 100644 --- a/ipn/test/test0x.c +++ b/ipn/test/test0x.c @@ -9,8 +9,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 #define IPN_SO_PREBIND 0x80 #define IPN_SO_PORT 0 diff --git a/ipn/test/test1.c b/ipn/test/test1.c index a1dc4a3..138a6ee 100644 --- a/ipn/test/test1.c +++ b/ipn/test/test1.c @@ -9,8 +9,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 char buf[256]; struct sockaddr_un sun={.sun_family=AF_IPN,.sun_path="/tmp/sockipn"}; diff --git a/ipn/test/test1x.c b/ipn/test/test1x.c index bf67e26..00efce8 100644 --- a/ipn/test/test1x.c +++ b/ipn/test/test1x.c @@ -9,8 +9,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 unsigned char buf[256]; struct sockaddr_un sun={.sun_family=AF_IPN,.sun_path="/tmp/sockipn"}; diff --git a/ipn/test/test2.c b/ipn/test/test2.c index a09e9dd..6f5c3da 100644 --- a/ipn/test/test2.c +++ b/ipn/test/test2.c @@ -12,8 +12,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 #define IPN_SO_PREBIND 0x80 #define IPN_SO_PORT 0 @@ -45,7 +45,7 @@ struct sockaddr_un sun={.sun_family=AF_IPN,.sun_path="/tmp/sockipn"}; main() { //int s=socket(AF_IPN,SOCK_RAW,IPN_BROADCAST); - int s=socket(AF_IPN,SOCK_RAW,IPN_SWITCH); + int s=socket(AF_IPN,SOCK_RAW,IPN_VDESWITCH); int err; int len; int flags=IPN_FLAG_LOSSLESS; diff --git a/ipn/test/test3.c b/ipn/test/test3.c index 9f91508..f8c4df9 100644 --- a/ipn/test/test3.c +++ b/ipn/test/test3.c @@ -12,8 +12,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 #define IPN_SO_PREBIND 0x80 #define IPN_SO_PORT 0 diff --git a/ipn/test/test4.c b/ipn/test/test4.c index 02c7b04..a921ba8 100644 --- a/ipn/test/test4.c +++ b/ipn/test/test4.c @@ -12,8 +12,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 #define IPN_SO_PREBIND 0x80 #define IPN_SO_PORT 0 @@ -41,7 +41,7 @@ #define IPN_FLAG_LOSSLESS 1 /*#define IPNTYPE IPN_BROADCAST*/ -#define IPNTYPE IPN_SWITCH +#define IPNTYPE IPN_VDESWITCH char buf[256]; struct sockaddr_un sun={.sun_family=AF_IPN,.sun_path="/tmp/sockipn"}; diff --git a/ipn/test/test4x.c b/ipn/test/test4x.c index 93c3029..0bd8a33 100644 --- a/ipn/test/test4x.c +++ b/ipn/test/test4x.c @@ -12,8 +12,8 @@ #define IPN_ANY 0 #define IPN_BROADCAST 1 #define IPN_HUB 1 -#define IPN_SWITCH 2 -#define IPN_SWITCH_L3 3 +#define IPN_VDESWITCH 2 +#define IPN_VDESWITCH_L3 3 #define IPN_SO_PREBIND 0x80 #define IPN_SO_PORT 0 @@ -41,7 +41,7 @@ #define IPN_FLAG_LOSSLESS 1 /*#define IPNTYPE IPN_BROADCAST*/ -#define IPNTYPE IPN_SWITCH +#define IPNTYPE IPN_VDESWITCH char buf[256]; struct sockaddr_un sun={.sun_family=AF_IPN,.sun_path="/tmp/sockipn"}; -- 2.11.4.GIT