libnet: added possiblity to query own IP address

Signed-off-by: Roni Häcki <roni.haecki@inf.ethz.ch>

diff --git a/include/net/dhcp.h b/include/net/dhcp.h
index c8fbfc7..41ca054 100644 (file)
--- a/include/net/dhcp.h
+++ b/include/net/dhcp.h
@@ -45,11 +45,12 @@ errval_t dhcpd_stop(void);
 /**
  * @brief queries the current ip setting of the machine
  *
- * @param flags flags to provide
+ * @param flags         flags to provide
+ * @param ip_address    Current Ip address
  *
  * @return SYS_ERR_OK on success, errval on failure
  */
-errval_t net_config_current_ip_query(net_flags_t flags);
+errval_t net_config_current_ip_query(net_flags_t flags, uint32_t* ip_address);
 
 
 /**

diff --git a/lib/net/dhcp.c b/lib/net/dhcp.c
index 73465f4..04c4633 100644 (file)
--- a/lib/net/dhcp.c
+++ b/lib/net/dhcp.c
@@ -140,7 +140,7 @@ errval_t dhcpd_stop(void)
  *
  * @return SYS_ERR_OK on success, errval on failure
  */
-errval_t net_config_current_ip_query(net_flags_t flags)
+errval_t net_config_current_ip_query(net_flags_t flags, uint32_t* ip_address)
 {
     errval_t err;
 
@@ -155,7 +155,7 @@ errval_t net_config_current_ip_query(net_flags_t flags)
     char* record = NULL;
     err = oct_get(&record, "net.current_ip");
     if (err_no(err) == OCT_ERR_NO_RECORD && (flags & NET_FLAGS_BLOCKING_INIT)) {
-        printf("waiting for DHCP to complete");
+        printf("waiting for DHCP to complete \n");
         err = oct_wait_for(&record, NET_CONFIG_CURRENT_IP_RECORD_REGEX);
         if (err_is_fail(err)) {
             return err;
@@ -178,6 +178,7 @@ errval_t net_config_current_ip_query(net_flags_t flags)
     ipaddr.s_addr = (uint32_t)ip;
     netmask.s_addr = (uint32_t)nm;
     gateway.s_addr = (uint32_t)gw;
+    *ip_address = (uint32_t)ip;
 
     debug_printf("Got current IP set: %s\n", inet_ntoa(ipaddr));
     debug_printf("Got current GW set: %s\n", inet_ntoa(gateway));