Changeset 262 for uKadecot/trunk/uip/apps/dhcpc/dhcpc.c

Timestamp:

Nov 18, 2016, 2:58:30 PM (7 years ago)

Author:

coas-nagasima

Message:

uIPを更新
プロジェクトファイルを更新

File:

• uKadecot/trunk/uip/apps/dhcpc/dhcpc.c (modified) (5 diffs)

uKadecot/trunk/uip/apps/dhcpc/dhcpc.c

@@ -160 +160 @@
   memcpy(m->xid, xid, sizeof(m->xid));
   m->secs = 0;
-  m->flags = HTONS(BOOTP_BROADCAST); /*  Broadcast bit. */
-  /*  uip_ipaddr_copy(m->ciaddr, uip_hostaddr);*/
-  memcpy(m->ciaddr, uip_hostaddr, sizeof(m->ciaddr));
+  m->flags = UIP_HTONS(BOOTP_BROADCAST); /*  Broadcast bit. */
+  /*  uip_ipaddr_copy(&m->ciaddr, &uip_hostaddr);*/
+  memcpy(m->ciaddr, &uip_hostaddr, sizeof(m->ciaddr));
   memset(m->yiaddr, 0, sizeof(m->yiaddr));
   memset(m->siaddr, 0, sizeof(m->siaddr));
@@ -329 +329 @@
          uip_ipaddr3(s->default_router), uip_ipaddr4(s->default_router));
   printf("Lease expires in %ld seconds\n",
-         ntohs(s->lease_time[0])*65536ul + ntohs(s->lease_time[1]));
+         uip_ntohs(s->lease_time[0])*65536ul + uip_ntohs(s->lease_time[1]));
 #endif
 
@@ -356 +356 @@
   uip_ipaddr_t addr;
 
-  uip_ipaddr(addr, 255,255,255,255);
-  conn = uip_udp_new(&addr, HTONS(DHCPC_SERVER_PORT));
+  uip_ipaddr(&addr, 255,255,255,255);
+  conn = uip_udp_new(&addr, UIP_HTONS(DHCPC_SERVER_PORT));
   if(conn != NULL) {
     s = &conn->appstate.parblk.dhcpc;
@@ -367 +367 @@
     s->conn->appstate.udp_callback = dhcpc_appcall;
 
-    uip_udp_bind(conn, HTONS(DHCPC_CLIENT_PORT));
+    uip_udp_bind(conn, UIP_HTONS(DHCPC_CLIENT_PORT));
 
     PT_INIT(&s->pt);
@@ -386 +386 @@
 dhcpc_request(struct dhcpc_state *s)
 {
-  uint16_t ipaddr[2];
+  uip_ipaddr_t ipaddr;
 
   s->state = STATE_REQUEST;
-  uip_ipaddr(ipaddr, 0,0,0,0);
-  uip_sethostaddr(ipaddr);
+  uip_ipaddr(&ipaddr, 0,0,0,0);
+  uip_sethostaddr(&ipaddr);
   uip_udp_conn = s->conn;
   uip_process(UIP_UDP_TIMER);