Fixed build warning for mismatch 78/187978/1
authorhyunuktak <hyunuk.tak@samsung.com>
Thu, 30 Aug 2018 05:55:48 +0000 (14:55 +0900)
committerhyunuktak <hyunuk.tak@samsung.com>
Thu, 30 Aug 2018 05:55:51 +0000 (14:55 +0900)
Change-Id: Iddb5257b1619c4725a427d40028c1f3c5acb3ed3
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
src/stc-iptables-util.c

index 30b1432..69ee885 100755 (executable)
@@ -259,7 +259,7 @@ void __stc_extract_6_rule(const char *key, GVariant *value,
                STC_LOGD("%s: [%u]", RULE_DPORTTYPE, rule->d_port_type);
 
        } else if (!g_strcmp0(key, RULE_SIP1)) {
-               if (rule->s_ip_type != IPTABLES_IP_NONE) {
+               if (rule->s_ip_type != IP6TABLES_IP_NONE) {
                        gsize len = 0;
                        char *str = g_variant_dup_string(value, &len);
                        sscanf(str, "%08x:%08x:%08x:%08x",
@@ -272,7 +272,7 @@ void __stc_extract_6_rule(const char *key, GVariant *value,
                }
 
        } else if (!g_strcmp0(key, RULE_SIP2)) {
-               if (rule->s_ip_type != IPTABLES_IP_NONE) {
+               if (rule->s_ip_type != IP6TABLES_IP_NONE) {
                        gsize len = 0;
                        char *str = g_variant_dup_string(value, &len);
                        sscanf(str, "%08x:%08x:%08x:%08x",
@@ -285,7 +285,7 @@ void __stc_extract_6_rule(const char *key, GVariant *value,
                }
 
        } else if (!g_strcmp0(key, RULE_DIP1)) {
-               if (rule->d_ip_type != IPTABLES_IP_NONE) {
+               if (rule->d_ip_type != IP6TABLES_IP_NONE) {
                        gsize len = 0;
                        char *str = g_variant_dup_string(value, &len);
                        sscanf(str, "%08x:%08x:%08x:%08x",
@@ -298,7 +298,7 @@ void __stc_extract_6_rule(const char *key, GVariant *value,
                }
 
        } else if (!g_strcmp0(key, RULE_DIP2)) {
-               if (rule->d_ip_type != IPTABLES_IP_NONE) {
+               if (rule->d_ip_type != IP6TABLES_IP_NONE) {
                        gsize len = 0;
                        char *str = g_variant_dup_string(value, &len);
                        sscanf(str, "%08x:%08x:%08x:%08x",
@@ -311,31 +311,31 @@ void __stc_extract_6_rule(const char *key, GVariant *value,
                }
 
        } else if (!g_strcmp0(key, RULE_SPORT1)) {
-               if (rule->s_port_type != IPTABLES_PORT_NONE) {
+               if (rule->s_port_type != IP6TABLES_PORT_NONE) {
                        rule->s_port1 = g_variant_get_uint32(value);
                        STC_LOGD("%s: [%04x]", RULE_SPORT1, rule->s_port1);
                }
 
        } else if (!g_strcmp0(key, RULE_SPORT2)) {
-               if (rule->s_port_type != IPTABLES_PORT_NONE) {
+               if (rule->s_port_type != IP6TABLES_PORT_NONE) {
                        rule->s_port2 = g_variant_get_uint32(value);
                        STC_LOGD("%s: [%04x]", RULE_SPORT2, rule->s_port2);
                }
 
        } else if (!g_strcmp0(key, RULE_DPORT1)) {
-               if (rule->d_port_type != IPTABLES_PORT_NONE) {
+               if (rule->d_port_type != IP6TABLES_PORT_NONE) {
                        rule->d_port1 = g_variant_get_uint32(value);
                        STC_LOGD("%s: [%04x]", RULE_DPORT1, rule->d_port1);
                }
 
        } else if (!g_strcmp0(key, RULE_DPORT2)) {
-               if (rule->d_port_type != IPTABLES_PORT_NONE) {
+               if (rule->d_port_type != IP6TABLES_PORT_NONE) {
                        rule->d_port2 = g_variant_get_uint32(value);
                        STC_LOGD("%s: [%04x]", RULE_DPORT2, rule->d_port2);
                }
 
        } else if (!g_strcmp0(key, RULE_IFNAME)) {
-               if (rule->direction != IPTABLES_DIRECTION_NONE) {
+               if (rule->direction != IP6TABLES_DIRECTION_NONE) {
                        gsize len = 0;
                        rule->ifname = g_variant_dup_string(value, &len);
                        STC_LOGD("%s: [%s]", RULE_IFNAME, rule->ifname);
@@ -364,39 +364,39 @@ void __stc_extract_6_rule(const char *key, GVariant *value,
                STC_LOGD("%s: [%u]", RULE_TARGETTYPE, rule->target_type);
 
        } else if (!g_strcmp0(key, RULE_LOG_LEVEL)) {
-               if (rule->target_type == IPTABLES_ACTION_LOG) {
+               if (rule->target_type == IP6TABLES_ACTION_LOG) {
                        rule->log_level = g_variant_get_uint16(value);
                        STC_LOGD("%s: [%u]", RULE_LOG_LEVEL, rule->log_level);
                }
 
        } else if (!g_strcmp0(key, RULE_LOG_PREFIX)) {
-               if (rule->target_type == IPTABLES_ACTION_LOG) {
+               if (rule->target_type == IP6TABLES_ACTION_LOG) {
                        gsize len = 0;
                        rule->log_prefix = g_variant_dup_string(value, &len);
                        STC_LOGD("%s: [%s]", RULE_LOG_PREFIX, rule->log_prefix);
                }
 
        } else if (!g_strcmp0(key, RULE_NFLOG_GROUP)) {
-               if (rule->target_type == IPTABLES_ACTION_NFLOG) {
+               if (rule->target_type == IP6TABLES_ACTION_NFLOG) {
                        rule->nflog_group = g_variant_get_uint16(value);
                        STC_LOGD("%s: [%u]", RULE_NFLOG_GROUP, rule->nflog_group);
                }
 
        } else if (!g_strcmp0(key, RULE_NFLOG_PREFIX)) {
-               if (rule->target_type == IPTABLES_ACTION_NFLOG) {
+               if (rule->target_type == IP6TABLES_ACTION_NFLOG) {
                        gsize len = 0;
                        rule->nflog_prefix = g_variant_dup_string(value, &len);
                        STC_LOGD("%s: [%s]", RULE_NFLOG_PREFIX, rule->nflog_prefix);
                }
 
        } else if (!g_strcmp0(key, RULE_NFLOG_RANGE)) {
-               if (rule->target_type == IPTABLES_ACTION_NFLOG) {
+               if (rule->target_type == IP6TABLES_ACTION_NFLOG) {
                        rule->nflog_range = g_variant_get_uint16(value);
                        STC_LOGD("%s: [%u]", RULE_NFLOG_RANGE, rule->nflog_range);
                }
 
        } else if (!g_strcmp0(key, RULE_NFLOG_THRESHOLD)) {
-               if (rule->target_type == IPTABLES_ACTION_NFLOG) {
+               if (rule->target_type == IP6TABLES_ACTION_NFLOG) {
                        rule->nflog_threshold = g_variant_get_uint16(value);
                        STC_LOGD("%s: [%u]", RULE_NFLOG_THRESHOLD, rule->nflog_threshold);
                }