Moved the ipcalc code to the network directory.
This commit is contained in:
parent
a90807fccb
commit
20a847e1b4
@ -39,7 +39,7 @@ set (network_SOURCES
|
|||||||
${PROJECT_SOURCE_DIR}/network/timeout.c
|
${PROJECT_SOURCE_DIR}/network/timeout.c
|
||||||
${PROJECT_SOURCE_DIR}/network/timer.c
|
${PROJECT_SOURCE_DIR}/network/timer.c
|
||||||
${PROJECT_SOURCE_DIR}/network/network.c
|
${PROJECT_SOURCE_DIR}/network/network.c
|
||||||
${PROJECT_SOURCE_DIR}/util/ipcalc.c
|
${PROJECT_SOURCE_DIR}/network/ipcalc.c
|
||||||
)
|
)
|
||||||
|
|
||||||
set (uhub_SOURCES
|
set (uhub_SOURCES
|
||||||
|
@ -31,6 +31,7 @@ struct net_statistics
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct net_socket_t;
|
struct net_socket_t;
|
||||||
|
struct ip_addr_encap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize the socket monitor subsystem.
|
* Initialize the socket monitor subsystem.
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
#include "system.h"
|
#include "system.h"
|
||||||
#include "util/credentials.h"
|
#include "util/credentials.h"
|
||||||
#include "util/ipcalc.h"
|
#include "network/ipcalc.h"
|
||||||
#include "plugin_api/types.h"
|
#include "plugin_api/types.h"
|
||||||
|
|
||||||
typedef void (*on_connection_accepted_t)(struct plugin_handle*, struct ip_addr_encap*);
|
typedef void (*on_connection_accepted_t)(struct plugin_handle*, struct ip_addr_encap*);
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
#include "plugin_api/handle.h"
|
#include "plugin_api/handle.h"
|
||||||
#include "util/memory.h"
|
#include "util/memory.h"
|
||||||
#include "util/list.h"
|
#include "util/list.h"
|
||||||
#include "util/ipcalc.h"
|
|
||||||
#include "util/misc.h"
|
#include "util/misc.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/config_token.h"
|
#include "util/config_token.h"
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
#include <sqlite3.h>
|
#include <sqlite3.h>
|
||||||
#include "util/memory.h"
|
#include "util/memory.h"
|
||||||
#include "util/list.h"
|
#include "util/list.h"
|
||||||
#include "util/ipcalc.h"
|
|
||||||
#include "util/misc.h"
|
#include "util/misc.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/config_token.h"
|
#include "util/config_token.h"
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "adc/adcconst.h"
|
#include "adc/adcconst.h"
|
||||||
#include "adc/sid.h"
|
#include "adc/sid.h"
|
||||||
#include "util/memory.h"
|
#include "util/memory.h"
|
||||||
#include "util/ipcalc.h"
|
#include "network/ipcalc.h"
|
||||||
#include "plugin_api/handle.h"
|
#include "plugin_api/handle.h"
|
||||||
|
|
||||||
#include "util/misc.h"
|
#include "util/misc.h"
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#include "adc/sid.h"
|
#include "adc/sid.h"
|
||||||
#include "util/cbuffer.h"
|
#include "util/cbuffer.h"
|
||||||
#include "util/memory.h"
|
#include "util/memory.h"
|
||||||
#include "util/ipcalc.h"
|
#include "network/ipcalc.h"
|
||||||
#include "plugin_api/handle.h"
|
#include "plugin_api/handle.h"
|
||||||
#include "plugin_api/command_api.h"
|
#include "plugin_api/command_api.h"
|
||||||
|
|
||||||
|
@ -63,7 +63,6 @@ extern "C" {
|
|||||||
#include "util/credentials.h"
|
#include "util/credentials.h"
|
||||||
#include "util/floodctl.h"
|
#include "util/floodctl.h"
|
||||||
#include "util/getopt.h"
|
#include "util/getopt.h"
|
||||||
#include "util/ipcalc.h"
|
|
||||||
#include "util/list.h"
|
#include "util/list.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/memory.h"
|
#include "util/memory.h"
|
||||||
@ -75,6 +74,7 @@ extern "C" {
|
|||||||
|
|
||||||
#include "network/network.h"
|
#include "network/network.h"
|
||||||
#include "network/connection.h"
|
#include "network/connection.h"
|
||||||
|
#include "network/ipcalc.h"
|
||||||
#include "network/timeout.h"
|
#include "network/timeout.h"
|
||||||
|
|
||||||
#include "core/auth.h"
|
#include "core/auth.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user