projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix clearing device state, trigger it on device_init()
[project/netifd.git]
/
system-dummy.c
diff --git
a/system-dummy.c
b/system-dummy.c
index
eab9277
..
00a9b2a
100644
(file)
--- a/
system-dummy.c
+++ b/
system-dummy.c
@@
-1,58
+1,71
@@
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
+#include <arpa/inet.h>
+
#ifndef DEBUG
#define DEBUG
#endif
#include "netifd.h"
#include "device.h"
#ifndef DEBUG
#define DEBUG
#endif
#include "netifd.h"
#include "device.h"
+#include "system.h"
+
+int system_init(void)
+{
+ return 0;
+}
-int system_bridge_addbr(struct device *bridge)
+int system_bridge_addbr(struct device *bridge
, struct bridge_config *cfg
)
{
{
- D
PRINTF(
"brctl addbr %s\n", bridge->ifname);
+ D
(SYSTEM,
"brctl addbr %s\n", bridge->ifname);
return 0;
}
int system_bridge_delbr(struct device *bridge)
{
return 0;
}
int system_bridge_delbr(struct device *bridge)
{
- D
PRINTF(
"brctl delbr %s\n", bridge->ifname);
+ D
(SYSTEM,
"brctl delbr %s\n", bridge->ifname);
return 0;
}
int system_bridge_addif(struct device *bridge, struct device *dev)
{
return 0;
}
int system_bridge_addif(struct device *bridge, struct device *dev)
{
- D
PRINTF(
"brctl addif %s %s\n", bridge->ifname, dev->ifname);
+ D
(SYSTEM,
"brctl addif %s %s\n", bridge->ifname, dev->ifname);
return 0;
}
int system_bridge_delif(struct device *bridge, struct device *dev)
{
return 0;
}
int system_bridge_delif(struct device *bridge, struct device *dev)
{
- D
PRINTF(
"brctl delif %s %s\n", bridge->ifname, dev->ifname);
+ D
(SYSTEM,
"brctl delif %s %s\n", bridge->ifname, dev->ifname);
return 0;
}
int system_vlan_add(struct device *dev, int id)
{
return 0;
}
int system_vlan_add(struct device *dev, int id)
{
- D
PRINTF(
"vconfig add %s %d\n", dev->ifname, id);
+ D
(SYSTEM,
"vconfig add %s %d\n", dev->ifname, id);
return 0;
}
int system_vlan_del(struct device *dev)
{
return 0;
}
int system_vlan_del(struct device *dev)
{
- D
PRINTF(
"vconfig rem %s\n", dev->ifname);
+ D
(SYSTEM,
"vconfig rem %s\n", dev->ifname);
return 0;
}
int system_if_up(struct device *dev)
{
return 0;
}
int system_if_up(struct device *dev)
{
- D
PRINTF(
"ifconfig %s up\n", dev->ifname);
+ D
(SYSTEM,
"ifconfig %s up\n", dev->ifname);
return 0;
}
int system_if_down(struct device *dev)
{
return 0;
}
int system_if_down(struct device *dev)
{
- DPRINTF("ifconfig %s down\n", dev->ifname);
+ D(SYSTEM, "ifconfig %s down\n", dev->ifname);
+ return 0;
+}
+
+void system_if_clear_state(struct device *dev)
+{
return 0;
}
return 0;
}
@@
-69,11
+82,15
@@
int system_if_check(struct device *dev)
int system_add_address(struct device *dev, struct device_addr *addr)
{
uint8_t *a = (uint8_t *) &addr->addr.in;
int system_add_address(struct device *dev, struct device_addr *addr)
{
uint8_t *a = (uint8_t *) &addr->addr.in;
+ char ipaddr[64];
if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) {
if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) {
- D
PRINTF(
"ifconfig %s add %d.%d.%d.%d/%d\n",
+ D
(SYSTEM,
"ifconfig %s add %d.%d.%d.%d/%d\n",
dev->ifname, a[0], a[1], a[2], a[3], addr->mask);
} else {
dev->ifname, a[0], a[1], a[2], a[3], addr->mask);
} else {
+ inet_ntop(AF_INET6, &addr->addr.in6, ipaddr, sizeof(struct in6_addr));
+ D(SYSTEM, "ifconfig %s add %s/%d\n",
+ dev->ifname, ipaddr, addr->mask);
return -1;
}
return -1;
}
@@
-83,11
+100,15
@@
int system_add_address(struct device *dev, struct device_addr *addr)
int system_del_address(struct device *dev, struct device_addr *addr)
{
uint8_t *a = (uint8_t *) &addr->addr.in;
int system_del_address(struct device *dev, struct device_addr *addr)
{
uint8_t *a = (uint8_t *) &addr->addr.in;
+ char ipaddr[64];
if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) {
if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) {
- D
PRINTF(
"ifconfig %s del %d.%d.%d.%d\n",
+ D
(SYSTEM,
"ifconfig %s del %d.%d.%d.%d\n",
dev->ifname, a[0], a[1], a[2], a[3]);
} else {
dev->ifname, a[0], a[1], a[2], a[3]);
} else {
+ inet_ntop(AF_INET6, &addr->addr.in6, ipaddr, sizeof(struct in6_addr));
+ D(SYSTEM, "ifconfig %s del %s/%d\n",
+ dev->ifname, ipaddr, addr->mask);
return -1;
}
return -1;
}
@@
-116,7
+137,7
@@
int system_add_route(struct device *dev, struct device_route *route)
if (route->flags & DEVADDR_DEVICE)
sprintf(devstr, " dev %s", dev->ifname);
if (route->flags & DEVADDR_DEVICE)
sprintf(devstr, " dev %s", dev->ifname);
- D
PRINTF(
"route add %s%s%s\n", addr, gw, devstr);
+ D
(SYSTEM,
"route add %s%s%s\n", addr, gw, devstr);
return 0;
}
return 0;
}
@@
-142,6
+163,6
@@
int system_del_route(struct device *dev, struct device_route *route)
if (route->flags & DEVADDR_DEVICE)
sprintf(devstr, " dev %s", dev->ifname);
if (route->flags & DEVADDR_DEVICE)
sprintf(devstr, " dev %s", dev->ifname);
- D
PRINTF(
"route del %s%s%s\n", addr, gw, devstr);
+ D
(SYSTEM,
"route del %s%s%s\n", addr, gw, devstr);
return 0;
}
return 0;
}