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

Timestamp:

Jul 23, 2015, 3:21:02 PM (9 years ago)

Author:

coas-nagasima

Message:

ECHONET Lite規格に準拠していない動作を修正。
WebSocketの接続先URLを/webapi.ashxから/webapiに変更。
DHCPのリトライ処理が行われていなかったのを修正。
DHCPの有効/無効設定を追加し、固定IPアドレスを設定できるよう変更。

File:

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

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

@@ -41 +41 @@
 
 #define STATE_INITIAL         0
-#define STATE_SENDING         1
-#define STATE_OFFER_RECEIVED  2
-#define STATE_CONFIG_RECEIVED 3
+#define STATE_REQUEST         1
+#define STATE_SENDING         2
+#define STATE_OFFER_RECEIVED  3
+#define STATE_CONFIG_RECEIVED 4
 
 #ifdef __RX
@@ -261 +262 @@
   PT_BEGIN(&s->pt);
 
+  if(s->state != STATE_REQUEST)
+    PT_YIELD(&s->pt);
+
   /* try_again:*/
   s->state = STATE_SENDING;
   s->ticks = 5 * CLOCK_SECOND;
 
-  send_discover(s);
-  timer_set(&s->timer, s->ticks);
-
   do {
+    printf("send_discover(%d)\n", s->timer);
+    send_discover(s);
+    timer_set(&s->timer, s->ticks);
+
     PT_WAIT_UNTIL(&s->pt, (ret = uip_newdata() ? 1 : (timer_expired(&s->timer) ? 2 : 0)) != 0);
 
@@ -288 +293 @@
   PT_YIELD(&s->pt);
 
-  send_request(s);
-  timer_set(&s->timer, s->ticks);
-
   do {
+    printf("send_request(%d)\n", s->timer);
+    send_request(s);
+    timer_set(&s->timer, s->ticks);
+
     PT_WAIT_UNTIL(&s->pt, (ret = uip_newdata() ? 1 : (timer_expired(&s->timer) ? 2 : 0)) != 0);
 
@@ -382 +388 @@
   u16_t ipaddr[2];
 
-  s->state = STATE_INITIAL;
+  s->state = STATE_REQUEST;
   uip_ipaddr(ipaddr, 0,0,0,0);
   uip_sethostaddr(ipaddr);