picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: clean up main header file a bit 

Rename networkd.h to networkd-manager.h, to more accurately describe what it
contains.
This commit is contained in:
Tom Gundersen 2016-11-13 04:59:06 +01:00
parent 441e9ae4d9
commit 23f53b99b1
27 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@ -5610,11 +5610,6 @@ libnetworkd_core_la_CFLAGS = \
libnetworkd_core_la_SOURCES = \
src/libsystemd-network/network-internal.h \
src/network/networkd.h \
src/network/networkd-conf.h \
src/network/networkd-conf.c \
src/network/networkd-link.h \
src/network/networkd-link.c \
src/network/netdev/netdev.h \
src/network/netdev/netdev.c \
src/network/netdev/vrf.h \
@ -5641,6 +5636,13 @@ libnetworkd_core_la_SOURCES = \
src/network/netdev/bridge.c \
src/network/netdev/vcan.h \
src/network/netdev/vcan.c \
src/network/networkd-manager.h \
src/network/networkd-manager.c \
src/network/networkd-manager-bus.c \
src/network/networkd-conf.h \
src/network/networkd-conf.c \
src/network/networkd-link.h \
src/network/networkd-link.c \
src/network/networkd-link-bus.c \
src/network/networkd-ipv4ll.c \
src/network/networkd-dhcp4.c \
@ -5654,8 +5656,6 @@ libnetworkd_core_la_SOURCES = \
src/network/networkd-address.c \
src/network/networkd-route.h \
src/network/networkd-route.c \
src/network/networkd-manager.c \
src/network/networkd-manager-bus.c \
src/network/networkd-fdb.h \
src/network/networkd-fdb.c \
src/network/networkd-brvlan.h \

2
src/network/netdev/bridge.c
View File

@ -22,8 +22,8 @@
#include "missing.h"
#include "netlink-util.h"
#include "networkd.h"
#include "netdev/bridge.h"
#include "networkd-manager.h"
/* callback for brige netdev's parameter set */
static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {

15
src/network/netdev/netdev.c
View File

@ -27,12 +27,25 @@
#include "netlink-util.h"
#include "network-internal.h"
#include "netdev/netdev.h"
#include "networkd.h"
#include "networkd-manager.h"
#include "siphash24.h"
#include "stat-util.h"
#include "string-table.h"
#include "string-util.h"
#include "netdev/bridge.h"
#include "netdev/bond.h"
#include "netdev/vlan.h"
#include "netdev/macvlan.h"
#include "netdev/ipvlan.h"
#include "netdev/vxlan.h"
#include "netdev/tunnel.h"
#include "netdev/tuntap.h"
#include "netdev/veth.h"
#include "netdev/dummy.h"
#include "netdev/vrf.h"
#include "netdev/vcan.h"
const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
[NETDEV_KIND_BRIDGE] = &bridge_vtable,
[NETDEV_KIND_BOND] = &bond_vtable,

2
src/network/networkd-address-pool.c
View File

@ -19,7 +19,7 @@
#include "alloc-util.h"
#include "networkd-address-pool.h"
#include "networkd.h"
#include "networkd-manager.h"
#include "set.h"
#include "string-util.h"

2
src/network/networkd-address.c
View File

@ -24,7 +24,7 @@
#include "firewall-util.h"
#include "netlink-util.h"
#include "networkd-address.h"
#include "networkd.h"
#include "networkd-manager.h"
#include "parse-util.h"
#include "set.h"
#include "socket-util.h"

4
src/network/networkd-brvlan.c
View File

@ -25,7 +25,9 @@
#include "conf-parser.h"
#include "netlink-util.h"
#include "networkd-brvlan.h"
#include "networkd.h"
#include "networkd-link.h"
#include "networkd-manager.h"
#include "networkd-network.h"
#include "parse-util.h"
#include "vlan-util.h"

2
src/network/networkd-conf.c
View File

@ -22,8 +22,10 @@
#include "conf-parser.h"
#include "def.h"
#include "dhcp-identifier.h"
#include "extract-word.h"
#include "hexdecoct.h"
#include "networkd-conf.h"
#include "networkd-network.h"
#include "string-table.h"
int manager_parse_config_file(Manager *m) {

2
src/network/networkd-conf.h
View File

@ -19,7 +19,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "networkd.h"
typedef struct Manager Manager;
int manager_parse_config_file(Manager *m);

4
src/network/networkd-dhcp4.c
View File

@ -24,7 +24,9 @@
#include "dhcp-lease-internal.h"
#include "hostname-util.h"
#include "network-internal.h"
#include "networkd.h"
#include "networkd-link.h"
#include "networkd-manager.h"
#include "networkd-network.h"
static int dhcp4_route_handler(sd_netlink *rtnl, sd_netlink_message *m,
void *userdata) {

4
src/network/networkd-dhcp6.c
View File

@ -23,7 +23,8 @@
#include "sd-dhcp6-client.h"
#include "network-internal.h"
#include "networkd.h"
#include "networkd-link.h"
#include "networkd-manager.h"
static int dhcp6_lease_address_acquired(sd_dhcp6_client *client, Link *link);
@ -125,7 +126,6 @@ static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) {
assert(link);
assert(link->network);
assert(link->manager);
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return;

3
src/network/networkd-fdb.c
View File

@ -22,9 +22,10 @@
#include "alloc-util.h"
#include "conf-parser.h"
#include "netdev/bridge.h"
#include "netlink-util.h"
#include "networkd-fdb.h"
#include "networkd.h"
#include "networkd-manager.h"
#include "util.h"
#include "vlan-util.h"

1
src/network/networkd-gperf.gperf
View File

@ -2,6 +2,7 @@
#include <stddef.h>
#include "conf-parser.h"
#include "networkd-conf.h"
#include "networkd-manager.h"
%}
struct ConfigPerfItem;
%null_strings

5
src/network/networkd-ipv4ll.c
View File

@ -21,7 +21,9 @@
#include <linux/if.h>
#include "network-internal.h"
#include "networkd.h"
#include "networkd-address.h"
#include "networkd-manager.h"
#include "networkd-link.h"
static int ipv4ll_address_lost(Link *link) {
_cleanup_address_free_ Address *address = NULL;
@ -171,7 +173,6 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
assert(link);
assert(link->network);
assert(link->manager);
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return;

2
src/network/networkd-link-bus.c
View File

@ -20,7 +20,7 @@
#include "alloc-util.h"
#include "bus-util.h"
#include "networkd-link.h"
#include "networkd.h"
#include "networkd-manager.h"
#include "parse-util.h"
#include "strv.h"

2
src/network/networkd-link.c
View File

@ -29,8 +29,8 @@
#include "netlink-util.h"
#include "network-internal.h"
#include "networkd-lldp-tx.h"
#include "networkd-manager.h"
#include "networkd-ndisc.h"
#include "networkd.h"
#include "set.h"
#include "socket-util.h"
#include "stdio-util.h"

2
src/network/networkd-lldp-tx.c
View File

@ -26,7 +26,7 @@
#include "fileio.h"
#include "hostname-util.h"
#include "networkd-lldp-tx.h"
#include "networkd.h"
#include "networkd-manager.h"
#include "parse-util.h"
#include "random-util.h"
#include "socket-util.h"

2
src/network/networkd-manager-bus.c
View File

@ -19,7 +19,7 @@
#include "alloc-util.h"
#include "bus-util.h"
#include "networkd.h"
#include "networkd-manager.h"
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);

2
src/network/networkd-manager.c
View File

@ -33,7 +33,7 @@
#include "libudev-private.h"
#include "local-addresses.h"
#include "netlink-util.h"
#include "networkd.h"
#include "networkd-manager.h"
#include "ordered-set.h"
#include "path-util.h"
#include "set.h"

13
src/network/networkd.h → src/network/networkd-manager.h
View File

@ -32,20 +32,7 @@
#include "networkd-address-pool.h"
#include "networkd-link.h"
#include "netdev/bond.h"
#include "netdev/bridge.h"
#include "netdev/dummy.h"
#include "netdev/ipvlan.h"
#include "netdev/macvlan.h"
#include "netdev/tunnel.h"
#include "netdev/tuntap.h"
#include "netdev/veth.h"
#include "netdev/vlan.h"
#include "netdev/vrf.h"
#include "netdev/vxlan.h"
#include "netdev/vcan.h"
#include "networkd-network.h"
#include "networkd-util.h"
extern const char* const network_dirs[];

3
src/network/networkd-ndisc.c
View File

@ -18,11 +18,12 @@
***/
#include <netinet/icmp6.h>
#include <arpa/inet.h>
#include "sd-ndisc.h"
#include "networkd.h"
#include "networkd-ndisc.h"
#include "networkd-route.h"
#define NDISC_DNSSL_MAX 64U
#define NDISC_RDNSS_MAX 64U

2
src/network/networkd-network-bus.c
View File

@ -18,7 +18,7 @@
***/
#include "alloc-util.h"
#include "networkd.h"
#include "networkd-manager.h"
#include "string-util.h"
#include "strv.h"

2
src/network/networkd-network-gperf.gperf
View File

@ -1,8 +1,8 @@
%{
#include <stddef.h>
#include "conf-parser.h"
#include "networkd.h"
#include "networkd-conf.h"
#include "networkd-network.h"
#include "network-internal.h"
#include "vlan-util.h"
%}

2
src/network/networkd-network.c
View File

@ -27,8 +27,8 @@
#include "fd-util.h"
#include "hostname-util.h"
#include "network-internal.h"
#include "networkd-manager.h"
#include "networkd-network.h"
#include "networkd.h"
#include "parse-util.h"
#include "set.h"
#include "stat-util.h"

2
src/network/networkd-route.c
View File

@ -21,8 +21,8 @@
#include "conf-parser.h"
#include "in-addr-util.h"
#include "netlink-util.h"
#include "networkd-manager.h"
#include "networkd-route.h"
#include "networkd.h"
#include "parse-util.h"
#include "set.h"
#include "string-util.h"

2
src/network/networkd.c
View File

@ -20,8 +20,8 @@
#include "sd-daemon.h"
#include "capability-util.h"
#include "networkd.h"
#include "networkd-conf.h"
#include "networkd-manager.h"
#include "signal-util.h"
#include "user-util.h"

4
src/network/test-network-tables.c
View File

@ -3,8 +3,10 @@
#include "ethtool-util.h"
#include "netlink-internal.h"
#include "netdev/bond.h"
#include "netdev/ipvlan.h"
#include "netdev/macvlan.h"
#include "networkd.h"
#include "networkd-link.h"
#include "networkd-util.h"
#include "test-tables.h"
int main(int argc, char **argv) {

2
src/network/test-network.c
View File

@ -20,7 +20,7 @@
#include "alloc-util.h"
#include "dhcp-lease-internal.h"
#include "network-internal.h"
#include "networkd.h"
#include "networkd-manager.h"
static void test_deserialize_in_addr(void) {
_cleanup_free_ struct in_addr *addresses = NULL;