changed config option for igmp version selection

new 'proto' key for selection of either IGMPv1/v2 or IGMPv3

Author: zocker007

doc/igmpproxy.conf.5.in

@@ -78,12 +78,14 @@ the risk of bandwidth saturation.
 .RE
 
 
-.B igmpv3
+.B proto
+.I protover
 .RS
-Enables IGMPv3 queries. On default settings, IGMPv1/2 queries are send out.
-With this setting, you can enable IGMPv3 frames for sending queries. This is needed
-for IGMPv3 capable hosts to send IGMPv3 reports. When a IGMPv3 capable host receives
-a IGMPv1/2 query, it answers with a IGMPv1/2 report.
+Specifies IGMP protocol version. On default or whith 'proto igmpv2', IGMPv1/2
+queries are send out. With 'proto igmpv3', you can enable IGMPv3 frames for
+sending queries. This is needed for IGMPv3 capable hosts to send IGMPv3 reports.
+When a IGMPv3 capable host receives a IGMPv1/2 query, it answers with a IGMPv1/2
+report.
 .RE
 
 

src/config.c

@@ -225,10 +225,18 @@ int loadConfig(char *configFile) {
             token = nextConfigToken();
             continue;
         }
-        else if(strcmp("igmpv3", token)==0) {
-            // got an igmpv3 token
-            my_log(LOG_DEBUG, 0, "Config: IGMPv3 mode enabled.");
-            commonConfig.useIgmpv3 = 1;
+        else if(strcmp("proto", token)==0) {
+            // IGMP protocol version to use is in next token
+            token = nextConfigToken();
+
+            if (strcmp("igmpv3", token) == 0) {
+                my_log(LOG_DEBUG, 0, "Config: IGMPv3 mode enabled.");
+                commonConfig.useIgmpv3 = 1;
+            }
+            else if (strcmp("igmpv2", token) == 0) {
+                my_log(LOG_DEBUG, 0, "Config: IGMPv2 mode enabled.");
+                commonConfig.useIgmpv3 = 0;
+            }
 
             // Read next token...
             token = nextConfigToken();