chinky/rtt-f030
chinky/rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup ping code;

Browse Source 
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@237 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2009-12-27 06:44:47 +00:00
parent 4de2f13fcd
commit 81c1b21e5d
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/apps/ping.c
View File

@ -20,20 +20,10 @@
#define PING_DEBUG LWIP_DBG_ON #define PING_DEBUG LWIP_DBG_ON
#endif #endif
/** ping target - should be a "struct ip_addr" */
#ifndef PING_TARGET
#define PING_TARGET (netif_default?netif_default->gw:ip_addr_any)
#endif
/** ping receive timeout - in milliseconds */ /** ping receive timeout - in milliseconds */
#ifndef PING_RCV_TIMEO
#define PING_RCV_TIMEO 1000 #define PING_RCV_TIMEO 1000
#endif
/** ping delay - in milliseconds */ /** ping delay - in milliseconds */
#ifndef PING_DELAY
#define PING_DELAY 100 #define PING_DELAY 100
#endif
/** ping identifier - must fit on a u16_t */ /** ping identifier - must fit on a u16_t */
#ifndef PING_ID #ifndef PING_ID
@ -45,11 +35,6 @@
#define PING_DATA_SIZE 32 #define PING_DATA_SIZE 32
#endif #endif
/** ping result action - no default action */
#ifndef PING_RESULT
#define PING_RESULT(ping_ok)
#endif
/* ping variables */ /* ping variables */
static u16_t ping_seq_num; static u16_t ping_seq_num;
struct _ip_addr struct _ip_addr
@ -125,8 +110,6 @@ static void ping_recv(int s)
iecho = (struct icmp_echo_hdr *)(buf+(IPH_HL(iphdr) * 4)); iecho = (struct icmp_echo_hdr *)(buf+(IPH_HL(iphdr) * 4));
if ((iecho->id == PING_ID) && (iecho->seqno == htons(ping_seq_num))) if ((iecho->id == PING_ID) && (iecho->seqno == htons(ping_seq_num)))
{ {
/* do some ping result processing */
PING_RESULT((ICMPH_TYPE(iecho) == ICMP_ER));
return; return;
} }
else else
@ -136,13 +119,10 @@ static void ping_recv(int s)
} }
} }
if (len == 0) if (len <= 0)
{ {
LWIP_DEBUGF( PING_DEBUG, ("ping: recv - %lu ms - timeout\n", (sys_now()-ping_time))); rt_kprintf("ping: timeout\n");
} }
/* do some ping result processing */
PING_RESULT(0);
} }
rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size) rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
@ -182,7 +162,7 @@ rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
} }
send_time ++; send_time ++;
if (send_time > time) break; /* send ping times reached, stop */ if (send_time >= time) break; /* send ping times reached, stop */
rt_thread_delay(PING_DELAY); /* take a delay */ rt_thread_delay(PING_DELAY); /* take a delay */
} }