diff options
Diffstat (limited to 'gdhcp/server.c')
| -rw-r--r-- | gdhcp/server.c | 171 |
1 files changed, 86 insertions, 85 deletions
diff --git a/gdhcp/server.c b/gdhcp/server.c index 0c5f2950..728992da 100644 --- a/gdhcp/server.c +++ b/gdhcp/server.c @@ -51,7 +51,7 @@ struct _GDHCPServer { int ref_count; GDHCPType type; - gboolean started; + bool started; int ifindex; char *interface; uint32_t start_ip; @@ -80,7 +80,7 @@ static inline void debug(GDHCPServer *server, const char *format, ...) char str[256]; va_list ap; - if (server->debug_func == NULL) + if (!server->debug_func) return; va_start(ap, format); @@ -143,14 +143,14 @@ static int get_lease(GDHCPServer *dhcp_server, uint32_t yiaddr, GINT_TO_POINTER((int) ntohl(yiaddr))); debug(dhcp_server, "lease_mac %p lease_nip %p", lease_mac, lease_nip); - if (lease_nip != NULL) { + if (lease_nip) { dhcp_server->lease_list = g_list_remove(dhcp_server->lease_list, lease_nip); g_hash_table_remove(dhcp_server->nip_lease_hash, GINT_TO_POINTER((int) ntohl(yiaddr))); - if (lease_mac == NULL) + if (!lease_mac) *lease = lease_nip; else if (lease_nip != lease_mac) { remove_lease(dhcp_server, lease_mac); @@ -161,7 +161,7 @@ static int get_lease(GDHCPServer *dhcp_server, uint32_t yiaddr, return 0; } - if (lease_mac != NULL) { + if (lease_mac) { dhcp_server->lease_list = g_list_remove(dhcp_server->lease_list, lease_mac); @@ -173,7 +173,7 @@ static int get_lease(GDHCPServer *dhcp_server, uint32_t yiaddr, } *lease = g_try_new0(struct dhcp_lease, 1); - if (*lease == NULL) + if (!*lease) return -ENOMEM; return 0; @@ -224,18 +224,18 @@ static struct dhcp_lease *find_lease_by_nip(GDHCPServer *dhcp_server, } /* Check if the IP is taken; if it is, add it to the lease table */ -static gboolean arp_check(uint32_t nip, const uint8_t *safe_mac) +static bool arp_check(uint32_t nip, const uint8_t *safe_mac) { /* TODO: Add ARP checking */ - return TRUE; + return true; } -static gboolean is_expired_lease(struct dhcp_lease *lease) +static bool is_expired_lease(struct dhcp_lease *lease) { if (lease->expire < time(NULL)) - return TRUE; + return true; - return FALSE; + return false; } static uint32_t find_free_or_expired_nip(GDHCPServer *dhcp_server, @@ -255,26 +255,26 @@ static uint32_t find_free_or_expired_nip(GDHCPServer *dhcp_server, continue; lease = find_lease_by_nip(dhcp_server, ip_addr); - if (lease != NULL) + if (lease) continue; - if (arp_check(htonl(ip_addr), safe_mac) == TRUE) + if (arp_check(htonl(ip_addr), safe_mac)) return ip_addr; } /* The last lease is the oldest one */ list = g_list_last(dhcp_server->lease_list); - if (list == NULL) + if (!list) return 0; lease = list->data; - if (lease == NULL) + if (!lease) return 0; - if (is_expired_lease(lease) == FALSE) + if (!is_expired_lease(lease)) return 0; - if (arp_check(lease->lease_nip, safe_mac) == FALSE) + if (!arp_check(lease->lease_nip, safe_mac)) return 0; return lease->lease_nip; @@ -357,18 +357,18 @@ GDHCPServer *g_dhcp_server_new(GDHCPType type, } dhcp_server = g_try_new0(GDHCPServer, 1); - if (dhcp_server == NULL) { + if (!dhcp_server) { *error = G_DHCP_SERVER_ERROR_NOMEM; return NULL; } dhcp_server->interface = get_interface_name(ifindex); - if (dhcp_server->interface == NULL) { + if (!dhcp_server->interface) { *error = G_DHCP_SERVER_ERROR_INTERFACE_UNAVAILABLE; goto error; } - if (interface_is_up(ifindex) == FALSE) { + if (!interface_is_up(ifindex)) { *error = G_DHCP_SERVER_ERROR_INTERFACE_DOWN; goto error; } @@ -424,7 +424,7 @@ static uint8_t check_packet_type(struct dhcp_packet *packet) type = dhcp_get_option(packet, DHCP_MESSAGE_TYPE); - if (type == NULL) + if (!type) return 0; if (*type < DHCP_MINTYPE) @@ -460,7 +460,7 @@ static void add_option(gpointer key, gpointer value, gpointer user_data) struct in_addr nip; struct dhcp_packet *packet = user_data; - if (option_value == NULL) + if (!option_value) return; switch (option_code) { @@ -485,28 +485,28 @@ static void add_server_options(GDHCPServer *dhcp_server, add_option, packet); } -static gboolean check_requested_nip(GDHCPServer *dhcp_server, +static bool check_requested_nip(GDHCPServer *dhcp_server, uint32_t requested_nip) { struct dhcp_lease *lease; if (requested_nip == 0) - return FALSE; + return false; if (requested_nip < dhcp_server->start_ip) - return FALSE; + return false; if (requested_nip > dhcp_server->end_ip) - return FALSE; + return false; lease = find_lease_by_nip(dhcp_server, requested_nip); - if (lease == NULL) - return TRUE; + if (!lease) + return true; - if (is_expired_lease(lease) == FALSE) - return FALSE; + if (!is_expired_lease(lease)) + return false; - return TRUE; + return true; } static void send_packet_to_client(GDHCPServer *dhcp_server, @@ -544,7 +544,7 @@ static void send_offer(GDHCPServer *dhcp_server, if (lease) packet.yiaddr = htonl(lease->lease_nip); - else if (check_requested_nip(dhcp_server, requested_nip) == TRUE) + else if (check_requested_nip(dhcp_server, requested_nip)) packet.yiaddr = htonl(requested_nip); else packet.yiaddr = htonl(find_free_or_expired_nip( @@ -559,7 +559,7 @@ static void send_offer(GDHCPServer *dhcp_server, lease = add_lease(dhcp_server, OFFER_TIME, packet.chaddr, packet.yiaddr); - if (lease == NULL) { + if (!lease) { debug(dhcp_server, "Err: No free IP addresses. OFFER abandoned"); return; @@ -579,7 +579,7 @@ static void save_lease(GDHCPServer *dhcp_server) { GList *list; - if (dhcp_server->save_lease_func == NULL) + if (!dhcp_server->save_lease_func) return; for (list = dhcp_server->lease_list; list; list = list->next) { @@ -677,65 +677,65 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition, lease = find_lease_by_mac(dhcp_server, packet.chaddr); switch (type) { - case DHCPDISCOVER: - debug(dhcp_server, "Received DISCOVER"); + case DHCPDISCOVER: + debug(dhcp_server, "Received DISCOVER"); - send_offer(dhcp_server, &packet, lease, requested_nip); + send_offer(dhcp_server, &packet, lease, requested_nip); break; - case DHCPREQUEST: - debug(dhcp_server, "Received REQUEST NIP %d", + case DHCPREQUEST: + debug(dhcp_server, "Received REQUEST NIP %d", requested_nip); - if (requested_nip == 0) { - requested_nip = packet.ciaddr; - if (requested_nip == 0) - break; - } - - if (lease && requested_nip == lease->lease_nip) { - debug(dhcp_server, "Sending ACK"); - send_ACK(dhcp_server, &packet, - lease->lease_nip); + if (requested_nip == 0) { + requested_nip = packet.ciaddr; + if (requested_nip == 0) break; - } + } + + if (lease && requested_nip == lease->lease_nip) { + debug(dhcp_server, "Sending ACK"); + send_ACK(dhcp_server, &packet, + lease->lease_nip); + break; + } - if (server_id_option || lease == NULL) { - debug(dhcp_server, "Sending NAK"); - send_NAK(dhcp_server, &packet); - } + if (server_id_option || !lease) { + debug(dhcp_server, "Sending NAK"); + send_NAK(dhcp_server, &packet); + } break; - case DHCPDECLINE: - debug(dhcp_server, "Received DECLINE"); + case DHCPDECLINE: + debug(dhcp_server, "Received DECLINE"); - if (server_id_option == NULL) - break; + if (!server_id_option) + break; - if (request_ip_option == NULL) - break; + if (!request_ip_option) + break; - if (lease == NULL) - break; + if (!lease) + break; - if (requested_nip == lease->lease_nip) - remove_lease(dhcp_server, lease); + if (requested_nip == lease->lease_nip) + remove_lease(dhcp_server, lease); break; - case DHCPRELEASE: - debug(dhcp_server, "Received RELEASE"); + case DHCPRELEASE: + debug(dhcp_server, "Received RELEASE"); - if (server_id_option == NULL) - break; + if (!server_id_option) + break; - if (lease == NULL) - break; + if (!lease) + break; - if (packet.ciaddr == lease->lease_nip) - lease_set_expire(dhcp_server, lease, - time(NULL)); + if (packet.ciaddr == lease->lease_nip) + lease_set_expire(dhcp_server, lease, + time(NULL)); break; - case DHCPINFORM: - debug(dhcp_server, "Received INFORM"); - send_inform(dhcp_server, &packet); + case DHCPINFORM: + debug(dhcp_server, "Received INFORM"); + send_inform(dhcp_server, &packet); break; } @@ -748,7 +748,7 @@ int g_dhcp_server_start(GDHCPServer *dhcp_server) GIOChannel *listener_channel; int listener_sockfd; - if (dhcp_server->started == TRUE) + if (dhcp_server->started) return 0; listener_sockfd = dhcp_l3_socket(SERVER_PORT, @@ -757,7 +757,7 @@ int g_dhcp_server_start(GDHCPServer *dhcp_server) return -EIO; listener_channel = g_io_channel_unix_new(listener_sockfd); - if (listener_channel == NULL) { + if (!listener_channel) { close(listener_sockfd); return -EIO; } @@ -783,7 +783,7 @@ int g_dhcp_server_set_option(GDHCPServer *dhcp_server, { struct in_addr nip; - if (option_value == NULL) + if (!option_value) return -EINVAL; debug(dhcp_server, "option_code %d option_value %s", @@ -808,7 +808,7 @@ int g_dhcp_server_set_option(GDHCPServer *dhcp_server, void g_dhcp_server_set_save_lease(GDHCPServer *dhcp_server, GDHCPSaveLeaseFunc func, gpointer user_data) { - if (dhcp_server == NULL) + if (!dhcp_server) return; dhcp_server->save_lease_func = func; @@ -816,7 +816,7 @@ void g_dhcp_server_set_save_lease(GDHCPServer *dhcp_server, GDHCPServer *g_dhcp_server_ref(GDHCPServer *dhcp_server) { - if (dhcp_server == NULL) + if (!dhcp_server) return NULL; __sync_fetch_and_add(&dhcp_server->ref_count, 1); @@ -841,7 +841,7 @@ void g_dhcp_server_stop(GDHCPServer *dhcp_server) void g_dhcp_server_unref(GDHCPServer *dhcp_server) { - if (dhcp_server == NULL) + if (!dhcp_server) return; if (__sync_fetch_and_sub(&dhcp_server->ref_count, 1) != 1) @@ -876,9 +876,10 @@ int g_dhcp_server_set_ip_range(GDHCPServer *dhcp_server, return 0; } -void g_dhcp_server_set_lease_time(GDHCPServer *dhcp_server, unsigned int lease_time) +void g_dhcp_server_set_lease_time(GDHCPServer *dhcp_server, + unsigned int lease_time) { - if (dhcp_server == NULL) + if (!dhcp_server) return; dhcp_server->lease_seconds = lease_time; @@ -887,7 +888,7 @@ void g_dhcp_server_set_lease_time(GDHCPServer *dhcp_server, unsigned int lease_t void g_dhcp_server_set_debug(GDHCPServer *dhcp_server, GDHCPDebugFunc func, gpointer user_data) { - if (dhcp_server == NULL) + if (!dhcp_server) return; dhcp_server->debug_func = func; |