In iousers_init(), compare "conv,ipv6" before "conv,ip" and be sure to compare all...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39277 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/tap-iousers.c b/tap-iousers.c
index 1c8b12458367707b29640c3cd8af5a2810bf7f54..175ec28155f4943a4e9fca67aacc1378a935ddcf 100644 (file)
--- a/tap-iousers.c
+++ b/tap-iousers.c
@@ -707,6 +707,15 @@ iousers_init(const char *optarg, void* userdata _U_)
                tap_type="ipx";
                tap_type_name="IPX";
                packet_func=iousers_ipx_packet;
+       } else if(!strncmp(optarg,"conv,ipv6",9)){
+               if(optarg[9]==','){
+                       filter=optarg+10;
+               } else {
+                       filter=NULL;
+               }
+               tap_type="ipv6";
+               tap_type_name="IPv6";
+               packet_func=iousers_ipv6_packet;
        } else if(!strncmp(optarg,"conv,ip",7)){
                if(optarg[7]==','){
                        filter=optarg+8;
@@ -716,15 +725,6 @@ iousers_init(const char *optarg, void* userdata _U_)
                tap_type="ip";
                tap_type_name="IPv4";
                packet_func=iousers_ip_packet;
-       } else if(!strncmp(optarg,"conv,ipv6",7)){
-               if(optarg[7]==','){
-                       filter=optarg+10;
-               } else {
-                       filter=NULL;
-               }
-               tap_type="ipv6";
-               tap_type_name="IPv6";
-               packet_func=iousers_ipv6_packet;
        } else if(!strncmp(optarg,"conv,sctp",9)) {
                if(optarg[9]==','){
                                filter=optarg+10;