system-linux: fix GRE ikey/okey endianness

[project/netifd.git] / system-linux.c

diff --git a/system-linux.c b/system-linux.c
index 3605d9b..483a98d 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -708,7 +708,7 @@ int system_bridge_addif(struct device *bridge, struct device *dev)
                system_bridge_set_wireless(bridge, dev);
 
        if (dev->settings.flags & DEV_OPT_MULTICAST_ROUTER) {
-               snprintf(buf, sizeof(buf), "%i", dev->settings.multicast_router);
+               snprintf(buf, sizeof(buf), "%u", dev->settings.multicast_router);
                system_bridge_set_multicast_router(dev, buf, false);
        }
 
@@ -995,7 +995,7 @@ static void system_bridge_conf_multicast(struct device *bridge,
                bridge->ifname, buf);
 
        if (bridge->settings.flags & DEV_OPT_MULTICAST_ROUTER) {
-               snprintf(buf, buf_len, "%i", bridge->settings.multicast_router);
+               snprintf(buf, buf_len, "%u", bridge->settings.multicast_router);
                system_bridge_set_multicast_router(bridge, buf, true);
        }
 
@@ -1456,37 +1456,37 @@ system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned
                        s->flags &= ~DEV_OPT_PROMISC;
        }
        if (s->flags & DEV_OPT_RPFILTER & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->rpfilter);
+               snprintf(buf, sizeof(buf), "%u", s->rpfilter);
                system_set_rpfilter(dev, buf);
        }
        if (s->flags & DEV_OPT_ACCEPTLOCAL & apply_mask)
                system_set_acceptlocal(dev, s->acceptlocal ? "1" : "0");
        if (s->flags & DEV_OPT_IGMPVERSION & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->igmpversion);
+               snprintf(buf, sizeof(buf), "%u", s->igmpversion);
                system_set_igmpversion(dev, buf);
        }
        if (s->flags & DEV_OPT_MLDVERSION & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->mldversion);
+               snprintf(buf, sizeof(buf), "%u", s->mldversion);
                system_set_mldversion(dev, buf);
        }
        if (s->flags & DEV_OPT_NEIGHREACHABLETIME & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->neigh4reachabletime);
+               snprintf(buf, sizeof(buf), "%u", s->neigh4reachabletime);
                system_set_neigh4reachabletime(dev, buf);
-               snprintf(buf, sizeof(buf), "%d", s->neigh6reachabletime);
+               snprintf(buf, sizeof(buf), "%u", s->neigh6reachabletime);
                system_set_neigh6reachabletime(dev, buf);
        }
        if (s->flags & DEV_OPT_NEIGHLOCKTIME & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->neigh4locktime);
+               snprintf(buf, sizeof(buf), "%u", s->neigh4locktime);
                system_set_neigh4locktime(dev, buf);
        }
        if (s->flags & DEV_OPT_NEIGHGCSTALETIME & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->neigh4gcstaletime);
+               snprintf(buf, sizeof(buf), "%u", s->neigh4gcstaletime);
                system_set_neigh4gcstaletime(dev, buf);
-               snprintf(buf, sizeof(buf), "%d", s->neigh6gcstaletime);
+               snprintf(buf, sizeof(buf), "%u", s->neigh6gcstaletime);
                system_set_neigh6gcstaletime(dev, buf);
        }
        if (s->flags & DEV_OPT_DADTRANSMITS & apply_mask) {
-               snprintf(buf, sizeof(buf), "%d", s->dadtransmits);
+               snprintf(buf, sizeof(buf), "%u", s->dadtransmits);
                system_set_dadtransmits(dev, buf);
        }
        if (s->flags & DEV_OPT_MULTICAST & apply_mask) {
@@ -2171,6 +2171,9 @@ static int system_iprule(struct iprule *rule, int cmd)
                        nla_put_u32(msg, FRA_TABLE, rule->lookup);
        }
 
+       if (rule->flags & IPRULE_SUP_PREFIXLEN)
+               nla_put_u32(msg, FRA_SUPPRESS_PREFIXLEN, rule->sup_prefixlen);
+
        if (rule->flags & IPRULE_GOTO)
                nla_put_u32(msg, FRA_GOTO, rule->gotoid);
 
@@ -2443,10 +2446,10 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
                nla_put_u16(nlm, IFLA_GRE_IFLAGS, iflags);
 
        if (okey)
-               nla_put_u32(nlm, IFLA_GRE_OKEY, okey);
+               nla_put_u32(nlm, IFLA_GRE_OKEY, htonl(okey));
 
        if (ikey)
-               nla_put_u32(nlm, IFLA_GRE_IKEY, ikey);
+               nla_put_u32(nlm, IFLA_GRE_IKEY, htonl(ikey));
 
        nla_nest_end(nlm, infodata);
        nla_nest_end(nlm, linkinfo);