girineko/dhcpd-pools
1
0
Fork 0
mirror of git://git.code.sf.net/p/dhcpd-pools/code synced 2025-12-16 15:57:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

getdata: split busy function to segments used via function pointer

Browse source 
When it is known IPv4 is in use there is no need to spend time with if
statements checking whether IPv6 is in use.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2013-09-18 00:35:33 +01:00
parent 5b8ad97611
commit 97c6f0292f
3 changed files with 73 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/dhcpd-pools.c
View file

@ -248,6 +248,7 @@ int main(int argc, char **argv)
/* Do the job */
prepare_memory();
xstrstr = xstrstr_init;
parse_config(true, config.dhcpdconf_file, shared_networks);
parse_leases();

14
src/dhcpd-pools.h
View file

@ -204,11 +204,23 @@ void copy_ipaddr(union ipaddr_t *restrict dst,
const union ipaddr_t *restrict src);
const char *ntop_ipaddr(const union ipaddr_t *ip);
double get_range_size(const struct range_t *r);
int xstrstr(const char *__restrict str)
int (*xstrstr)(const char *__restrict str);
int xstrstr_init(const char *__restrict str)
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
__attribute__ ((__hot__))
# endif
;
int xstrstr_v4(const char *__restrict str)
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
__attribute__ ((__hot__))
# endif
;
int xstrstr_v6(const char *__restrict str)
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
__attribute__ ((__hot__))
# endif
;
double strtod_or_err(const char *__restrict str,
const char *__restrict errmesg);
void print_version(void) __attribute__ ((noreturn));

82
src/other.c
View file

@ -68,8 +68,10 @@ int parse_ipaddr(const char *restrict src, union ipaddr_t *restrict dst)
struct in6_addr addr6;
if (inet_aton(src, &addr) == 1) {
config.dhcp_version = VERSION_4;
xstrstr = xstrstr_v4;
} else if (inet_pton(AF_INET6, src, &addr6) == 1) {
config.dhcp_version = VERSION_6;
xstrstr = xstrstr_v6;
} else {
return 0;
}
@ -148,8 +150,9 @@ double get_range_size(const struct range_t *r)
}
}
/*! \fn xstrstr(const char *restrict str)
* \brief Categorize dhcpd.leases line.
/*! \fn xstrstr_init(const char *restrict str)
* \brief Determine if the dhcpd is in IPv4 or IPv6 mode. This function
* may be needed when dhcpd.conf file has zero IP version hints.
*
* \param str A line from dhcpd.conf
* \return prefix_t enum value
@ -158,28 +161,39 @@ int
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
__attribute__ ((hot))
#endif
xstrstr(const char *restrict str)
xstrstr_init(const char *restrict str)
{
if (memcmp("lease ", str, 6)) {
config.dhcp_version = VERSION_4;
xstrstr = xstrstr_v4;
return PREFIX_LEASE;
} else if (memcmp(" iaaddr ", str, 9)) {
config.dhcp_version = VERSION_6;
xstrstr = xstrstr_v6;
return PREFIX_LEASE;
}
return NUM_OF_PREFIX;
}
/*! \fn xstrstr_v4(const char *restrict str)
* \brief parse lease file in IPv4 mode
*
* \param str A line from dhcpd.conf
* \return prefix_t enum value
*/
int
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
__attribute__ ((hot))
#endif
xstrstr_v4(const char *restrict str)
{
size_t len;
/* Needed when dhcpd.conf has zero range definitions. */
if (config.dhcp_version == VERSION_UNKNOWN) {
if (memcmp("lease ", str, 6)) {
config.dhcp_version = VERSION_4;
return PREFIX_LEASE;
} else if (memcmp(" iaaddr ", str, 9)) {
config.dhcp_version = VERSION_6;
return PREFIX_LEASE;
}
return NUM_OF_PREFIX;
}
if ((config.dhcp_version == VERSION_4 && str[2] == 'b')
|| (config.dhcp_version == VERSION_6 && str[4] == 'b')
|| str[2] == 'h') {
if (str[2] == 'b' || str[2] == 'h') {
len = strlen(str);
} else {
len = 0;
}
if (15 < len && config.dhcp_version == VERSION_4) {
if (15 < len) {
switch (str[16]) {
case 'f':
if (!memcmp(" binding state free;", str, 21))
@ -208,7 +222,32 @@ int
return PREFIX_HARDWARE_ETHERNET;
break;
}
} else if (17 < len /* && config.dhcp_version == VERSION_6 */ ) {
}
if (!memcmp("lease ", str, 6)) {
return PREFIX_LEASE;
}
return NUM_OF_PREFIX;
}
/*! \fn xstrstr_v4(const char *restrict str)
* \brief parse lease file in IPv6 mode
*
* \param str A line from dhcpd.conf
* \return prefix_t enum value
*/
int
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
__attribute__ ((hot))
#endif
xstrstr_v6(const char *restrict str)
{
size_t len;
if (str[4] == 'b' || str[2] == 'h') {
len = strlen(str);
} else {
len = 0;
}
if (17 < len) {
switch (str[18]) {
case 'f':
if (!memcmp(" binding state free;", str, 23))
@ -238,10 +277,7 @@ int
break;
}
}
if (config.dhcp_version == VERSION_4 && !memcmp("lease ", str, 6)) {
return PREFIX_LEASE;
} else if (config.dhcp_version == VERSION_6
&& !memcmp(" iaaddr ", str, 9)) {
if (!memcmp(" iaaddr ", str, 9)) {
return PREFIX_LEASE;
}
return NUM_OF_PREFIX;