X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdhcp%2Fserver.c;fp=gdhcp%2Fserver.c;h=44ce771a0fc7383f4a3e0c25da62cb3cbab03e7d;hb=30602f521a85820a9f6b7ac04876400e00c68b15;hp=f7795f7e610de76fdb0c75f62481d4a3f5d804b5;hpb=9362752a471a5c892d679548fbf2828d5fc5684b;p=platform%2Fupstream%2Fconnman.git diff --git a/gdhcp/server.c b/gdhcp/server.c old mode 100644 new mode 100755 index f7795f7..44ce771 --- a/gdhcp/server.c +++ b/gdhcp/server.c @@ -66,6 +66,7 @@ struct _GDHCPServer { GHashTable *option_hash; /* Options send to client */ GDHCPSaveLeaseFunc save_lease_func; GDHCPLeaseAddedCb lease_added_cb; + GDHCPSaveACKLeaseFunc save_ack_lease_func; GDHCPDebugFunc debug_func; gpointer debug_data; }; @@ -399,6 +400,7 @@ GDHCPServer *g_dhcp_server_new(GDHCPType type, dhcp_server->listener_watch = -1; dhcp_server->listener_channel = NULL; dhcp_server->save_lease_func = NULL; + dhcp_server->save_ack_lease_func = NULL; dhcp_server->debug_func = NULL; dhcp_server->debug_data = NULL; @@ -650,9 +652,12 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition, struct dhcp_packet packet; struct dhcp_lease *lease; uint32_t requested_nip = 0; - uint8_t type, *server_id_option, *request_ip_option; + uint8_t type, *server_id_option, *request_ip_option, *host_name; int re; + GDHCPOptionType option_type; + char *option_value; + if (condition & (G_IO_NVAL | G_IO_ERR | G_IO_HUP)) { dhcp_server->listener_watch = 0; return FALSE; @@ -698,8 +703,21 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition, if (lease && requested_nip == lease->lease_nip) { debug(dhcp_server, "Sending ACK"); + + host_name = dhcp_get_option(&packet, DHCP_HOST_NAME); + option_type = dhcp_get_code_type(DHCP_HOST_NAME); + option_value = malloc_option_value_string(host_name, + option_type); send_ACK(dhcp_server, &packet, lease->lease_nip); + + if (dhcp_server->save_ack_lease_func) + dhcp_server->save_ack_lease_func( + option_value, + lease->lease_mac, + lease->lease_nip); + g_free(option_value); + break; } @@ -828,6 +846,15 @@ void g_dhcp_server_set_lease_added_cb(GDHCPServer *dhcp_server, dhcp_server->lease_added_cb = cb; } +void g_dhcp_server_set_save_ack_lease(GDHCPServer *dhcp_server, + GDHCPSaveACKLeaseFunc func, gpointer user_data) +{ + if (dhcp_server == NULL) + return; + + dhcp_server->save_ack_lease_func = func; +} + GDHCPServer *g_dhcp_server_ref(GDHCPServer *dhcp_server) { if (!dhcp_server)