Skip to content

Commit

Permalink
network: hide unnecessary symbols
Browse files Browse the repository at this point in the history 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Jul 20, 2020
1 parent 9e20bf0 commit 1d332c4
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 62 deletions.
50 changes: 49 additions & 1 deletion src/lxc/Makefile.am
View file
Expand Up @@ -127,8 +127,8 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \
memory_utils.h \
mainloop.c mainloop.h \
namespace.c namespace.h \
nl.c nl.h \
network.c network.h \
nl.c nl.h \
monitor.c monitor.h \
parse.c parse.h \
process_utils.c process_utils.h \
Expand Down Expand Up @@ -340,6 +340,8 @@ lxc_attach_SOURCES = tools/lxc_attach.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
rexec.c rexec.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
Expand All @@ -357,6 +359,8 @@ lxc_autostart_SOURCES = tools/lxc_autostart.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_autostart_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -373,6 +377,8 @@ lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_cgroup_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -389,6 +395,8 @@ lxc_config_SOURCES = tools/lxc_config.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_config_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -405,6 +413,8 @@ lxc_console_SOURCES = tools/lxc_console.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_console_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -421,6 +431,8 @@ lxc_destroy_SOURCES = tools/lxc_destroy.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_destroy_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -437,6 +449,8 @@ lxc_device_SOURCES = tools/lxc_device.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_device_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -453,6 +467,8 @@ lxc_execute_SOURCES = tools/lxc_execute.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_execute_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -469,6 +485,8 @@ lxc_freeze_SOURCES = tools/lxc_freeze.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_freeze_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -485,6 +503,8 @@ lxc_info_SOURCES = tools/lxc_info.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_info_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -503,6 +523,8 @@ lxc_monitor_SOURCES = tools/lxc_monitor.c \
macro.h \
monitor.c monitor.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_monitor_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -520,6 +542,8 @@ lxc_ls_SOURCES = tools/lxc_ls.c \
log.c log.h \
memory_utils.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_ls_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -536,6 +560,8 @@ lxc_copy_SOURCES = tools/lxc_copy.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
storage/storage_utils.c storage/storage_utils.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
Expand All @@ -553,6 +579,8 @@ lxc_start_SOURCES = tools/lxc_start.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_start_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -570,6 +598,8 @@ lxc_stop_SOURCES = tools/lxc_stop.c \
log.c log.h \
mainloop.c mainloop.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_stop_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -587,6 +617,8 @@ lxc_top_SOURCES = tools/lxc_top.c \
log.c log.h \
mainloop.c mainloop.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_top_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -603,6 +635,8 @@ lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_unfreeze_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -619,6 +653,8 @@ lxc_unshare_SOURCES = tools/lxc_unshare.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h \
syscall_numbers.h \
syscall_wrappers.h
Expand All @@ -637,6 +673,8 @@ lxc_wait_SOURCES = tools/lxc_wait.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_wait_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -653,6 +691,8 @@ lxc_create_SOURCES = tools/lxc_create.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
storage/storage_utils.c storage/storage_utils.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
Expand All @@ -670,6 +710,8 @@ lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_snapshot_SOURCES += seccomp.c lxcseccomp.h
Expand All @@ -686,6 +728,8 @@ lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
initutils.c initutils.h \
log.c log.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h
if ENABLE_SECCOMP
lxc_checkpoint_SOURCES += seccomp.c lxcseccomp.h
Expand Down Expand Up @@ -725,6 +769,8 @@ lxc_monitord_SOURCES = cmd/lxc_monitord.c \
mainloop.c mainloop.h \
monitor.c monitor.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
process_utils.c process_utils.h \
string_utils.c string_utils.h \
syscall_numbers.h \
Expand Down Expand Up @@ -769,6 +815,8 @@ lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
macro.h \
memory_utils.h \
namespace.c namespace.h \
network.c network.h \
nl.c nl.h \
string_utils.c string_utils.h \
syscall_wrappers.h \
utils.c utils.h
Expand Down
118 changes: 57 additions & 61 deletions src/lxc/network.h
View file
Expand Up @@ -10,6 +10,7 @@
#include <sys/socket.h>
#include <unistd.h>

#include "compiler.h"
#include "list.h"

struct lxc_conf;
Expand Down Expand Up @@ -180,107 +181,102 @@ struct lxc_netdev {
};

/* Convert a string mac address to a socket structure. */
extern int lxc_convert_mac(char *macaddr, struct sockaddr *sockaddr);
__hidden extern int lxc_convert_mac(char *macaddr, struct sockaddr *sockaddr);

/* Move a device between namespaces. */
extern int lxc_netdev_move_by_index(int ifindex, pid_t pid, const char *ifname);
extern int lxc_netdev_move_by_name(const char *ifname, pid_t pid,
const char *newname);
__hidden extern int lxc_netdev_move_by_index(int ifindex, pid_t pid, const char *ifname);
__hidden extern int lxc_netdev_move_by_name(const char *ifname, pid_t pid, const char *newname);

/* Delete a network device. */
extern int lxc_netdev_delete_by_name(const char *name);
extern int lxc_netdev_delete_by_index(int ifindex);
__hidden extern int lxc_netdev_delete_by_name(const char *name);
__hidden extern int lxc_netdev_delete_by_index(int ifindex);

/* Change the device name. */
extern int lxc_netdev_rename_by_name(const char *oldname, const char *newname);
extern int lxc_netdev_rename_by_index(int ifindex, const char *newname);
__hidden extern int lxc_netdev_rename_by_name(const char *oldname, const char *newname);
__hidden extern int lxc_netdev_rename_by_index(int ifindex, const char *newname);

extern int netdev_set_flag(const char *name, int flag);
__hidden extern int netdev_set_flag(const char *name, int flag);

/* Set the device network up or down. */
extern int lxc_netdev_isup(const char *name);
extern int lxc_netdev_up(const char *name);
extern int lxc_netdev_down(const char *name);
__hidden extern int lxc_netdev_isup(const char *name);
__hidden extern int lxc_netdev_up(const char *name);
__hidden extern int lxc_netdev_down(const char *name);

/* Change the mtu size for the specified device. */
extern int lxc_netdev_set_mtu(const char *name, int mtu);
__hidden extern int lxc_netdev_set_mtu(const char *name, int mtu);

/* Create a virtual network devices. */
extern int lxc_veth_create(const char *name1, const char *name2, pid_t pid,
unsigned int mtu);
extern int lxc_macvlan_create(const char *parent, const char *name, int mode);
extern int lxc_vlan_create(const char *parent, const char *name,
unsigned short vid);
__hidden extern int lxc_veth_create(const char *name1, const char *name2, pid_t pid,
unsigned int mtu);
__hidden extern int lxc_macvlan_create(const char *parent, const char *name, int mode);
__hidden extern int lxc_vlan_create(const char *parent, const char *name, unsigned short vid);

/* Set ip address. */
extern int lxc_ipv6_addr_add(int ifindex, struct in6_addr *addr,
struct in6_addr *mcast,
struct in6_addr *acast, int prefix);
__hidden extern int lxc_ipv6_addr_add(int ifindex, struct in6_addr *addr, struct in6_addr *mcast,
struct in6_addr *acast, int prefix);

extern int lxc_ipv4_addr_add(int ifindex, struct in_addr *addr,
struct in_addr *bcast, int prefix);
__hidden extern int lxc_ipv4_addr_add(int ifindex, struct in_addr *addr, struct in_addr *bcast,
int prefix);

/* Get ip address. */
extern int lxc_ipv4_addr_get(int ifindex, struct in_addr **res);
extern int lxc_ipv6_addr_get(int ifindex, struct in6_addr **res);
__hidden extern int lxc_ipv4_addr_get(int ifindex, struct in_addr **res);
__hidden extern int lxc_ipv6_addr_get(int ifindex, struct in6_addr **res);

/* Set default route. */
extern int lxc_ipv4_gateway_add(int ifindex, struct in_addr *gw);
extern int lxc_ipv6_gateway_add(int ifindex, struct in6_addr *gw);
__hidden extern int lxc_ipv4_gateway_add(int ifindex, struct in_addr *gw);
__hidden extern int lxc_ipv6_gateway_add(int ifindex, struct in6_addr *gw);

/* Attach an interface to the bridge. */
extern int lxc_bridge_attach(const char *bridge, const char *ifname);
extern int lxc_ovs_delete_port(const char *bridge, const char *nic);
__hidden extern int lxc_bridge_attach(const char *bridge, const char *ifname);
__hidden extern int lxc_ovs_delete_port(const char *bridge, const char *nic);

extern bool is_ovs_bridge(const char *bridge);
__hidden extern bool is_ovs_bridge(const char *bridge);

/* Create default gateway. */
extern int lxc_route_create_default(const char *addr, const char *ifname,
int gateway);
__hidden extern int lxc_route_create_default(const char *addr, const char *ifname, int gateway);

/* Delete default gateway. */
extern int lxc_route_delete_default(const char *addr, const char *ifname,
int gateway);
__hidden extern int lxc_route_delete_default(const char *addr, const char *ifname, int gateway);

/* Activate neighbor proxying. */
extern int lxc_neigh_proxy_on(const char *name, int family);
__hidden extern int lxc_neigh_proxy_on(const char *name, int family);

/* Disable neighbor proxying. */
extern int lxc_neigh_proxy_off(const char *name, int family);
__hidden extern int lxc_neigh_proxy_off(const char *name, int family);

/* Activate IP forwarding. */
extern int lxc_ip_forwarding_on(const char *name, int family);
__hidden extern int lxc_ip_forwarding_on(const char *name, int family);

/* Disable IP forwarding. */
extern int lxc_ip_forwarding_off(const char *name, int family);
__hidden extern int lxc_ip_forwarding_off(const char *name, int family);

/*
* Generate a new unique network interface name.
*
* Allows for 62^n unique combinations.
*/
extern char *lxc_ifname_alnum_case_sensitive(char *template);

extern const char *lxc_net_type_to_str(int type);
extern int setup_private_host_hw_addr(char *veth1);
extern int netdev_get_mtu(int ifindex);
extern int lxc_network_move_created_netdev_priv(struct lxc_handler *handler);
extern void lxc_delete_network(struct lxc_handler *handler);
extern int lxc_find_gateway_addresses(struct lxc_handler *handler);
extern int lxc_requests_empty_network(struct lxc_handler *handler);
extern int lxc_restore_phys_nics_to_netns(struct lxc_handler *handler);
extern int lxc_setup_network_in_child_namespaces(const struct lxc_conf *conf,
struct lxc_list *network);
extern int lxc_network_send_to_child(struct lxc_handler *handler);
extern int lxc_network_recv_from_parent(struct lxc_handler *handler);
extern int lxc_network_send_name_and_ifindex_to_parent(struct lxc_handler *handler);
extern int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler);
extern int lxc_netns_set_nsid(int netns_fd);
extern int lxc_netns_get_nsid(__s32 fd);
extern int lxc_create_network(struct lxc_handler *handler);

extern char *is_wlan(const char *ifname);
extern int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid,
const char *newname);
__hidden extern char *lxc_ifname_alnum_case_sensitive(char *template);

__hidden extern const char *lxc_net_type_to_str(int type);
__hidden extern int setup_private_host_hw_addr(char *veth1);
__hidden extern int netdev_get_mtu(int ifindex);
__hidden extern int lxc_network_move_created_netdev_priv(struct lxc_handler *handler);
__hidden extern void lxc_delete_network(struct lxc_handler *handler);
__hidden extern int lxc_find_gateway_addresses(struct lxc_handler *handler);
__hidden extern int lxc_requests_empty_network(struct lxc_handler *handler);
__hidden extern int lxc_restore_phys_nics_to_netns(struct lxc_handler *handler);
__hidden extern int lxc_setup_network_in_child_namespaces(const struct lxc_conf *conf,
struct lxc_list *network);
__hidden extern int lxc_network_send_to_child(struct lxc_handler *handler);
__hidden extern int lxc_network_recv_from_parent(struct lxc_handler *handler);
__hidden extern int lxc_network_send_name_and_ifindex_to_parent(struct lxc_handler *handler);
__hidden extern int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler);
__hidden extern int lxc_netns_set_nsid(int netns_fd);
__hidden extern int lxc_netns_get_nsid(__s32 fd);
__hidden extern int lxc_create_network(struct lxc_handler *handler);

__hidden extern char *is_wlan(const char *ifname);
__hidden extern int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid,
const char *newname);

#endif /* __LXC_NETWORK_H */

0 comments on commit 1d332c4

Please sign in to comment.