diff options
| author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2012-10-11 10:11:52 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-10-11 15:31:43 +0200 |
| commit | 132bb54b219270304d3047eedb5d60b58d94db16 (patch) | |
| tree | 636c6a5516b9a3e7c1a0ba9bb9cfe74280fdacc8 /gdhcp/server.c | |
| parent | 635f1e814e4e5a0d4f8356475dff32515e78f692 (diff) | |
| download | connman-132bb54b219270304d3047eedb5d60b58d94db16.tar.gz connman-132bb54b219270304d3047eedb5d60b58d94db16.tar.bz2 connman-132bb54b219270304d3047eedb5d60b58d94db16.zip | |
gdhcp: Use data size specific option setting function
Instead of using dhcp_add_simple_option() the gdhcp now uses
three functions for setting uint8, uint16 and uint32 values.
Diffstat (limited to 'gdhcp/server.c')
| -rw-r--r-- | gdhcp/server.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gdhcp/server.c b/gdhcp/server.c index 2de7db69..0c5f2950 100644 --- a/gdhcp/server.c +++ b/gdhcp/server.c @@ -449,7 +449,8 @@ static void init_packet(GDHCPServer *dhcp_server, struct dhcp_packet *packet, packet->flags = client_packet->flags; packet->gateway_nip = client_packet->gateway_nip; packet->ciaddr = client_packet->ciaddr; - dhcp_add_simple_option(packet, DHCP_SERVER_ID, dhcp_server->server_nip); + dhcp_add_option_uint32(packet, DHCP_SERVER_ID, + dhcp_server->server_nip); } static void add_option(gpointer key, gpointer value, gpointer user_data) @@ -469,7 +470,7 @@ static void add_option(gpointer key, gpointer value, gpointer user_data) if (inet_aton(option_value, &nip) == 0) return; - dhcp_add_simple_option(packet, (uint8_t) option_code, + dhcp_add_option_uint32(packet, (uint8_t) option_code, ntohl(nip.s_addr)); break; default: @@ -564,7 +565,7 @@ static void send_offer(GDHCPServer *dhcp_server, return; } - dhcp_add_simple_option(&packet, DHCP_LEASE_TIME, + dhcp_add_option_uint32(&packet, DHCP_LEASE_TIME, dhcp_server->lease_seconds); add_server_options(dhcp_server, &packet); @@ -600,7 +601,7 @@ static void send_ACK(GDHCPServer *dhcp_server, lease_time_sec = dhcp_server->lease_seconds; - dhcp_add_simple_option(&packet, DHCP_LEASE_TIME, lease_time_sec); + dhcp_add_option_uint32(&packet, DHCP_LEASE_TIME, lease_time_sec); add_server_options(dhcp_server, &packet); |