github-personal/udevmand
1
0
Fork 0
mirror of https://github.com/outbackdingo/udevmand.git synced 2026-01-27 10:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

udevmand: improve neighbour enumeration

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-02-03 11:58:39 +01:00
parent 8b3fada390
commit 7f0726ba03
4 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mac.c
View File

@@ -56,6 +56,8 @@ mac_dump(struct mac *mac, int interface)
char buf[18];
void *c, *d;
neigh_enum();
clock_gettime(CLOCK_MONOTONIC, &ts);
last_seen = ts.tv_sec - mac->ts.tv_sec;
@@ -110,6 +112,7 @@ mac_dump(struct mac *mac, int interface)
}
blobmsg_close_array(&b, c);
neigh_flush();
}
int

1
main.c
View File

@@ -22,7 +22,6 @@ int main(int argc, char **argv)
ethers_init();
neigh_init();
bridge_init();
neigh_enum();
dhcp_init();
uloop_run();
uloop_done();

11
neigh.c
View File

@@ -159,6 +159,17 @@ neigh_enum(void)
nl_wait_for_ack(rtnl_sock.sock);
}
void
neigh_flush(void)
{
struct neigh *neigh, *tmp;
avl_for_each_element_safe(&ip4_tree, neigh, avl, tmp)
neigh_del(neigh);
avl_for_each_element_safe(&ip6_tree, neigh, avl, tmp)
neigh_del(neigh);
}
int
neigh_init(void)
{

64
udevmand.h
View File

@@ -100,46 +100,44 @@ struct bridge_mac {
__u8 port_no;
};
extern int avl_mac_cmp(const void *k1, const void *k2, void *ptr);
int avl_mac_cmp(const void *k1, const void *k2, void *ptr);
extern struct avl_tree mac_tree;
extern int mac_dump_all(void);
extern void mac_dump(struct mac *mac, int interface);
extern struct mac* mac_find(uint8_t *addr);
extern void mac_update(struct mac *mac, char *iface);
struct avl_tree mac_tree;
int mac_dump_all(void);
void mac_dump(struct mac *mac, int interface);
struct mac* mac_find(uint8_t *addr);
void mac_update(struct mac *mac, char *iface);
extern int neigh_init(void);
extern void neigh_enum(void);
int neigh_init(void);
void neigh_enum(void);
void neigh_flush(void);
extern bool nl_status_socket(struct nl_socket *ev, int protocol,
int (*cb)(struct nl_msg *msg, void *arg), void *priv);
extern int genl_send_and_recv(struct nl_socket *ev, struct nl_msg * msg);
bool nl_status_socket(struct nl_socket *ev, int protocol,
int (*cb)(struct nl_msg *msg, void *arg), void *priv);
int genl_send_and_recv(struct nl_socket *ev, struct nl_msg * msg);
extern int nl80211_init(void);
extern void nl80211_enum(void);
struct blob_buf b;
void blobmsg_add_iface(struct blob_buf *bbuf, char *name, int index);
void blobmsg_add_iftype(struct blob_buf *bbuf, const char *name, const uint32_t iftype);
void blobmsg_add_ipv4(struct blob_buf *bbuf, const char *name, const uint8_t* addr);
void blobmsg_add_ipv6(struct blob_buf *bbuf, const char *name, const uint8_t* addr);
void blobmsg_add_mac(struct blob_buf *bbuf, const char *name, const uint8_t* addr);
extern struct blob_buf b;
extern void blobmsg_add_iface(struct blob_buf *bbuf, char *name, int index);
extern void blobmsg_add_iftype(struct blob_buf *bbuf, const char *name, const uint32_t iftype);
extern void blobmsg_add_ipv4(struct blob_buf *bbuf, const char *name, const uint8_t* addr);
extern void blobmsg_add_ipv6(struct blob_buf *bbuf, const char *name, const uint8_t* addr);
extern void blobmsg_add_mac(struct blob_buf *bbuf, const char *name, const uint8_t* addr);
void ubus_init(void);
void ubus_uninit(void);
extern void ubus_init(void);
extern void ubus_uninit(void);
void bridge_init(void);
void bridge_dump_if(const char *bridge);
extern void bridge_init(void);
extern void bridge_dump_if(const char *bridge);
void dhcpv4_ack(struct blob_attr *msg);
void dhcpv4_release(struct blob_attr *msg);
void dhcp_init(void);
extern void dhcpv4_ack(struct blob_attr *msg);
extern void dhcpv4_release(struct blob_attr *msg);
extern void dhcp_init(void);
int interface_dump(void);
void interface_update(struct blob_attr *msg, int raw);
void interface_down(struct blob_attr *msg);
char *interface_resolve(char *device);
extern int interface_dump(void);
extern void interface_update(struct blob_attr *msg, int raw);
extern void interface_down(struct blob_attr *msg);
extern char *interface_resolve(char *device);
void ethers_init(void);
extern void ethers_init(void);
extern void iface_dump(void);
void iface_dump(void);