peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-30 04:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/confd: add support for ipv6 in ietf-interfaces

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-04-17 14:09:24 +02:00
parent 36d4e1b92b
commit f080ebd341
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/ietf-interfaces.c
+32 -3
View File
@@ -50,6 +50,7 @@ static int ifchange(sr_session_ctx_t *session, uint32_t sub_id, const char *modu
for (size_t i = 0; i < cnt; i++) {
const char *xpath = val[i].xpath;
char path[strlen(xpath) + 64];
int dad_xmit = 1;
sr_val_t *addr;
size_t addrcnt;
char *ifname;
@@ -65,7 +66,7 @@ static int ifchange(sr_session_ctx_t *session, uint32_t sub_id, const char *modu
"/proc/sys/net/ipv4/conf/%s/forwarding", ifname);
systemf("ip addr flush dev %s", ifname);
if (!srx_enabled(session, "%s//ietf-ip:ipv4/enabled", xpath))
if (!srx_enabled(session, "%s/ietf-ip:ipv4/enabled", xpath))
goto ipv6;
snprintf(path, sizeof(path), "%s/ietf-ip:ipv4/address", xpath);
@@ -90,10 +91,38 @@ static int ifchange(sr_session_ctx_t *session, uint32_t sub_id, const char *modu
systemf("ip addr add %s/%d dev %s", address, plen, ifname);
free(address);
}
ipv6:
/* XXX todo */
writedf(srx_enabled(session, "%s/ietf-ip:ipv6/forwarding", xpath),
"/proc/sys/net/ipv6/conf/%s/forwarding", ifname);
SRX_GET_UINT32(session, dad_xmit, "%s/ietf-ip:ipv6/dup-addr-detect-transmits", xpath);
writedf(dad_xmit, "/proc/sys/net/ipv6/conf/%s/dad_transmits", ifname);
if (!srx_enabled(session, "%s/ietf-ip:ipv6/enabled", xpath)) {
writedf(1, "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
goto done;
}
writedf(0, "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
writedf(srx_enabled(session, "%s/ietf-ip:ipv6/autoconf/create-global-addresses", xpath),
"/proc/sys/net/ipv6/conf/%s/autoconf", ifname);
snprintf(path, sizeof(path), "%s/ietf-ip:ipv6/address", xpath);
rc = sr_get_items(session, path, 0, 0, &addr, &addrcnt);
for (size_t j = 0; j < addrcnt; j++) {
char *address;
int plen = 0;
address = srx_get_str(session, "%s/ip", addr[j].xpath);
SRX_GET_UINT8(session, plen, "%s/prefix-length", addr[j].xpath);
if (plen == 0)
ERROR("%s: missing netmask or invalid prefix-length", address);
else
systemf("ip addr add %s/%d dev %s", address, plen, ifname);
free(address);
}
done:
systemf("ip link set %s %s", ifname, srx_enabled(session, "%s/enabled", xpath) ? "up" : "down");
free(ifname);
}
src/confd/src/srx_val.h
+2 -1
View File
@@ -5,7 +5,8 @@
#include "core.h"
#define SRX_GET_UINT8(s,v,fmt,...) srx_get_int(s, &v, SR_UINT8_T, fmt, ##__VA_ARGS__)
#define SRX_GET_UINT8(s,v,fmt,...) srx_get_int(s, &v, SR_UINT8_T, fmt, ##__VA_ARGS__)
#define SRX_GET_UINT32(s,v,fmt,...) srx_get_int(s, &v, SR_UINT32_T, fmt, ##__VA_ARGS__)
char *srx_get_str (sr_session_ctx_t *session, const char *fmt, ...);
int srx_get_int (sr_session_ctx_t *session, int *result, sr_val_type_t type, const char *fmt, ...);