emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcp: merge most of static_leases.c into dhcpd.c

Browse Source 
function                                             old     new   delta
read_staticlease                                     121     222    +101
add_static_lease                                      48       -     -48
log_static_leases                                     68       -     -68
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 1/0 up/down: 101/-116)          Total: -15 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-10-04 00:43:14 +02:00
parent 2bf2931d52
commit d2ae66cb3e
3 changed files with 58 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
networking/udhcp/dhcpd.c
View File

@ -39,7 +39,64 @@
#include "dhcpc.h" #include "dhcpc.h"
#include "dhcpd.h" #include "dhcpd.h"
/* on these functions, make sure your datatype matches */ /* Takes the address of the pointer to the static_leases linked list,
* address to a 6 byte mac address,
* 4 byte IP address */
static void add_static_lease(struct static_lease **st_lease_pp,
uint8_t *mac,
uint32_t nip)
{
struct static_lease *st_lease;
/* Find the tail of the list */
while ((st_lease = *st_lease_pp) != NULL) {
st_lease_pp = &st_lease->next;
}
/* Add new node */
*st_lease_pp = st_lease = xzalloc(sizeof(*st_lease));
memcpy(st_lease->mac, mac, 6);
st_lease->nip = nip;
/*st_lease->next = NULL;*/
}
/* Find static lease IP by mac */
static uint32_t get_static_nip_by_mac(struct static_lease *st_lease, void *mac)
{
while (st_lease) {
if (memcmp(st_lease->mac, mac, 6) == 0)
return st_lease->nip;
st_lease = st_lease->next;
}
return 0;
}
#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
/* Print out static leases just to check what's going on */
/* Takes the address of the pointer to the static_leases linked list */
static void log_static_leases(struct static_lease **st_lease_pp)
{
struct static_lease *cur;
if (dhcp_verbose < 2)
return;
cur = *st_lease_pp;
while (cur) {
bb_error_msg("static lease: mac:%02x:%02x:%02x:%02x:%02x:%02x nip:%x",
cur->mac[0], cur->mac[1], cur->mac[2],
cur->mac[3], cur->mac[4], cur->mac[5],
cur->nip
);
cur = cur->next;
}
}
#else
# define log_static_leases(st_lease_pp) ((void)0)
#endif
/* On these functions, make sure your datatype matches */
static int FAST_FUNC read_str(const char *line, void *arg) static int FAST_FUNC read_str(const char *line, void *arg)
{ {
char **dest = arg; char **dest = arg;

13
networking/udhcp/dhcpd.h
View File

@ -102,20 +102,7 @@ struct dyn_lease *find_lease_by_mac(const uint8_t *mac) FAST_FUNC;
struct dyn_lease *find_lease_by_nip(uint32_t nip) FAST_FUNC; struct dyn_lease *find_lease_by_nip(uint32_t nip) FAST_FUNC;
uint32_t find_free_or_expired_nip(const uint8_t *safe_mac, unsigned arpping_ms) FAST_FUNC; uint32_t find_free_or_expired_nip(const uint8_t *safe_mac, unsigned arpping_ms) FAST_FUNC;
/* Config file parser will pass static lease info to this function
* which will add it to a data structure that can be searched later */
void add_static_lease(struct static_lease **st_lease_pp, uint8_t *mac, uint32_t nip) FAST_FUNC;
/* Find static lease IP by mac */
uint32_t get_static_nip_by_mac(struct static_lease *st_lease, void *arg) FAST_FUNC;
/* Check to see if an IP is reserved as a static IP */
int is_nip_reserved(struct static_lease *st_lease, uint32_t nip) FAST_FUNC; int is_nip_reserved(struct static_lease *st_lease, uint32_t nip) FAST_FUNC;
/* Print out static leases just to check what's going on (debug code) */
#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
void log_static_leases(struct static_lease **st_lease_pp) FAST_FUNC;
#else
# define log_static_leases(st_lease_pp) ((void)0)
#endif
POP_SAVED_FUNCTION_VISIBILITY POP_SAVED_FUNCTION_VISIBILITY

55
networking/udhcp/static_leases.c
View File

@ -9,39 +9,6 @@
#include "common.h" #include "common.h"
#include "dhcpd.h" #include "dhcpd.h"
/* Takes the address of the pointer to the static_leases linked list,
* address to a 6 byte mac address,
* 4 byte IP address */
void FAST_FUNC add_static_lease(struct static_lease **st_lease_pp,
uint8_t *mac,
uint32_t nip)
{
struct static_lease *st_lease;
/* Find the tail of the list */
while ((st_lease = *st_lease_pp) != NULL) {
st_lease_pp = &st_lease->next;
}
/* Add new node */
*st_lease_pp = st_lease = xzalloc(sizeof(*st_lease));
memcpy(st_lease->mac, mac, 6);
st_lease->nip = nip;
/*st_lease->next = NULL;*/
}
/* Find static lease IP by mac */
uint32_t FAST_FUNC get_static_nip_by_mac(struct static_lease *st_lease, void *mac)
{
while (st_lease) {
if (memcmp(st_lease->mac, mac, 6) == 0)
return st_lease->nip;
st_lease = st_lease->next;
}
return 0;
}
/* Check to see if an IP is reserved as a static IP */ /* Check to see if an IP is reserved as a static IP */
int FAST_FUNC is_nip_reserved(struct static_lease *st_lease, uint32_t nip) int FAST_FUNC is_nip_reserved(struct static_lease *st_lease, uint32_t nip)
{ {
@ -53,25 +20,3 @@ int FAST_FUNC is_nip_reserved(struct static_lease *st_lease, uint32_t nip)
return 0; return 0;
} }
#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
/* Print out static leases just to check what's going on */
/* Takes the address of the pointer to the static_leases linked list */
void FAST_FUNC log_static_leases(struct static_lease **st_lease_pp)
{
struct static_lease *cur;
if (dhcp_verbose < 2)
return;
cur = *st_lease_pp;
while (cur) {
bb_error_msg("static lease: mac:%02x:%02x:%02x:%02x:%02x:%02x nip:%x",
cur->mac[0], cur->mac[1], cur->mac[2],
cur->mac[3], cur->mac[4], cur->mac[5],
cur->nip
);
cur = cur->next;
}
}
#endif