Macintosh-SW/lwip-contrib-mac
1
0
Fork 0
mirror of https://github.com/ep00ch/lwip-contrib-mac.git synced 2024-07-07 20:29:04 +00:00
Code Issues Projects Releases Wiki Activity

2008-09-30 David Woodhouse <dwmw2@infradead.org> :

Browse Source 
* ports/unix/sys_arch.c, ports/unix/include/arch/cc.h,
        ports/unix/netif/tcpdump.c, ports/unix/proj/unixsim/simhost.c:
        Fix 64-bit issues in unix port.
        * ports/unix/include/arch/cc.h: silence warning about packed
        attribute on fields, since whole struct is packed.
        * ports/unix/proj/unixsim/apps/shell.c: Remove rexmit fields
        from stat data, in line with lwip stats changes.
This commit is contained in:
jifl 2008-09-30 13:48:07 +00:00
parent 0eaad1ca9b
commit ba11c223fa
5 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/unix/include/arch/cc.h
View File

@ -46,21 +46,21 @@ typedef unsigned char u8_t;
typedef signed char s8_t; typedef signed char s8_t;
typedef unsigned short u16_t; typedef unsigned short u16_t;
typedef signed short s16_t; typedef signed short s16_t;
typedef unsigned long u32_t; typedef unsigned int u32_t;
typedef signed long s32_t; typedef signed int s32_t;
typedef u32_t mem_ptr_t; typedef unsigned long mem_ptr_t;
/* Define (sn)printf formatters for these lwIP types */ /* Define (sn)printf formatters for these lwIP types */
#define U16_F "hu" #define U16_F "hu"
#define S16_F "hd" #define S16_F "hd"
#define X16_F "hx" #define X16_F "hx"
#define U32_F "lu" #define U32_F "u"
#define S32_F "ld" #define S32_F "d"
#define X32_F "lx" #define X32_F "x"
/* Compiler hints for packing structures */ /* Compiler hints for packing structures */
#define PACK_STRUCT_FIELD(x) x __attribute__((packed)) #define PACK_STRUCT_FIELD(x) x
#define PACK_STRUCT_STRUCT __attribute__((packed)) #define PACK_STRUCT_STRUCT __attribute__((packed))
#define PACK_STRUCT_BEGIN #define PACK_STRUCT_BEGIN
#define PACK_STRUCT_END #define PACK_STRUCT_END

4
ports/unix/netif/tcpdump.c
View File

@ -123,14 +123,14 @@ tcpdump(struct pbuf *p)
len = ntohs(IPH_LEN(iphdr)) - offset * 4 - IP_HLEN; len = ntohs(IPH_LEN(iphdr)) - offset * 4 - IP_HLEN;
if (len != 0 || flags[0] != '.') { if (len != 0 || flags[0] != '.') {
fprintf(file, "%s %lu:%lu(%u) ", fprintf(file, "%s %u:%u(%u) ",
flags, flags,
ntohl(tcphdr->seqno), ntohl(tcphdr->seqno),
ntohl(tcphdr->seqno) + len, ntohl(tcphdr->seqno) + len,
len); len);
} }
if (TCPH_FLAGS(tcphdr) & TCP_ACK) { if (TCPH_FLAGS(tcphdr) & TCP_ACK) {
fprintf(file, "ack %lu ", fprintf(file, "ack %u ",
ntohl(tcphdr->ackno)); ntohl(tcphdr->ackno));
} }
fprintf(file, "wnd %u\n", fprintf(file, "wnd %u\n",

20
ports/unix/proj/unixsim/apps/shell.c
View File

@ -80,11 +80,10 @@ clos [connection #]: closes a TCP or UDP connection.\n\
stat: prints out lwIP statistics.\n\ stat: prints out lwIP statistics.\n\
quit: quits.\n"; quit: quits.\n";
#define STAT_NUM (((5 + UDP_STATS) * 13) + (4) + (11 * 4) + (2 * 3)) #define STAT_NUM (((5 + UDP_STATS) * 12) + (4) + (11 * 4) + (2 * 3))
static char *stat_msgs[STAT_NUM] = { static char *stat_msgs[STAT_NUM] = {
"Link level * transmitted ", "Link level * transmitted ",
" retransmitted ",
" * received ", " * received ",
" forwarded ", " forwarded ",
" * dropped ", " * dropped ",
@ -97,7 +96,6 @@ static char *stat_msgs[STAT_NUM] = {
" * misc errors ", " * misc errors ",
" cache hits ", " cache hits ",
"IP_FRAG * transmitted ", "IP_FRAG * transmitted ",
" retransmitted ",
" * received ", " * received ",
" * forwarded ", " * forwarded ",
" * dropped ", " * dropped ",
@ -110,7 +108,6 @@ static char *stat_msgs[STAT_NUM] = {
" * misc errors ", " * misc errors ",
" cache hits ", " cache hits ",
"IP * transmitted ", "IP * transmitted ",
" retransmitted ",
" * received ", " * received ",
" * forwarded ", " * forwarded ",
" * dropped ", " * dropped ",
@ -123,7 +120,6 @@ static char *stat_msgs[STAT_NUM] = {
" * misc errors ", " * misc errors ",
" cache hits ", " cache hits ",
"ICMP * transmitted ", "ICMP * transmitted ",
" retransmitted ",
" * received ", " * received ",
" forwarded ", " forwarded ",
" * dropped ", " * dropped ",
@ -137,7 +133,6 @@ static char *stat_msgs[STAT_NUM] = {
" cache hits ", " cache hits ",
#if UDP_STATS #if UDP_STATS
"UDP * transmitted ", "UDP * transmitted ",
" retransmitted ",
" * received ", " * received ",
" forwarded ", " forwarded ",
" * dropped ", " * dropped ",
@ -151,7 +146,6 @@ static char *stat_msgs[STAT_NUM] = {
" cache hits ", " cache hits ",
#endif #endif
"TCP * transmitted ", "TCP * transmitted ",
" * retransmitted ",
" * received ", " * received ",
" forwarded ", " forwarded ",
" * dropped ", " * dropped ",
@ -221,7 +215,6 @@ static char *stat_msgs[STAT_NUM] = {
static char *stat_formats[STAT_NUM] = { static char *stat_formats[STAT_NUM] = {
U16_F, /* link xmit */ U16_F, /* link xmit */
U16_F, /* link rexmit */
U16_F, /* link recv */ U16_F, /* link recv */
U16_F, /* link fw */ U16_F, /* link fw */
U16_F, /* link drop */ U16_F, /* link drop */
@ -235,7 +228,6 @@ static char *stat_formats[STAT_NUM] = {
U16_F, /* link cachehit */ U16_F, /* link cachehit */
U16_F, /* ip_frag xmit */ U16_F, /* ip_frag xmit */
U16_F, /* ip_frag rexmit */
U16_F, /* ip_frag recv */ U16_F, /* ip_frag recv */
U16_F, /* ip_frag fw */ U16_F, /* ip_frag fw */
U16_F, /* ip_frag drop */ U16_F, /* ip_frag drop */
@ -249,7 +241,6 @@ static char *stat_formats[STAT_NUM] = {
U16_F, /* ip_frag cachehit */ U16_F, /* ip_frag cachehit */
U16_F, /* ip xmit */ U16_F, /* ip xmit */
U16_F, /* ip rexmit */
U16_F, /* ip recv */ U16_F, /* ip recv */
U16_F, /* ip fw */ U16_F, /* ip fw */
U16_F, /* ip drop */ U16_F, /* ip drop */
@ -263,7 +254,6 @@ static char *stat_formats[STAT_NUM] = {
U16_F, /* ip cachehit */ U16_F, /* ip cachehit */
U16_F, /* icmp xmit */ U16_F, /* icmp xmit */
U16_F, /* icmp rexmit */
U16_F, /* icmp recv */ U16_F, /* icmp recv */
U16_F, /* icmp fw */ U16_F, /* icmp fw */
U16_F, /* icmp drop */ U16_F, /* icmp drop */
@ -278,7 +268,6 @@ static char *stat_formats[STAT_NUM] = {
#if UDP_STATS #if UDP_STATS
U16_F, /* udp xmit */ U16_F, /* udp xmit */
U16_F, /* udp rexmit */
U16_F, /* udp recv */ U16_F, /* udp recv */
U16_F, /* udp fw */ U16_F, /* udp fw */
U16_F, /* udp drop */ U16_F, /* udp drop */
@ -293,7 +282,6 @@ static char *stat_formats[STAT_NUM] = {
#endif #endif
U16_F, /* tcp xmit */ U16_F, /* tcp xmit */
U16_F, /* tcp exmit */
U16_F, /* tcp recv */ U16_F, /* tcp recv */
U16_F, /* tcp fw */ U16_F, /* tcp fw */
U16_F, /* tcp drop */ U16_F, /* tcp drop */
@ -378,7 +366,6 @@ static char *stat_formats[STAT_NUM] = {
static void *stat_ptrs[STAT_NUM] = { static void *stat_ptrs[STAT_NUM] = {
&lwip_stats.link.xmit, &lwip_stats.link.xmit,
&lwip_stats.link.rexmit,
&lwip_stats.link.recv, &lwip_stats.link.recv,
&lwip_stats.link.fw, &lwip_stats.link.fw,
&lwip_stats.link.drop, &lwip_stats.link.drop,
@ -392,7 +379,6 @@ static void *stat_ptrs[STAT_NUM] = {
&lwip_stats.link.cachehit, &lwip_stats.link.cachehit,
&lwip_stats.ip_frag.xmit, &lwip_stats.ip_frag.xmit,
&lwip_stats.ip_frag.rexmit,
&lwip_stats.ip_frag.recv, &lwip_stats.ip_frag.recv,
&lwip_stats.ip_frag.fw, &lwip_stats.ip_frag.fw,
&lwip_stats.ip_frag.drop, &lwip_stats.ip_frag.drop,
@ -406,7 +392,6 @@ static void *stat_ptrs[STAT_NUM] = {
&lwip_stats.ip_frag.cachehit, &lwip_stats.ip_frag.cachehit,
&lwip_stats.ip.xmit, &lwip_stats.ip.xmit,
&lwip_stats.ip.rexmit,
&lwip_stats.ip.recv, &lwip_stats.ip.recv,
&lwip_stats.ip.fw, &lwip_stats.ip.fw,
&lwip_stats.ip.drop, &lwip_stats.ip.drop,
@ -420,7 +405,6 @@ static void *stat_ptrs[STAT_NUM] = {
&lwip_stats.ip.cachehit, &lwip_stats.ip.cachehit,
&lwip_stats.icmp.xmit, &lwip_stats.icmp.xmit,
&lwip_stats.icmp.rexmit,
&lwip_stats.icmp.recv, &lwip_stats.icmp.recv,
&lwip_stats.icmp.fw, &lwip_stats.icmp.fw,
&lwip_stats.icmp.drop, &lwip_stats.icmp.drop,
@ -435,7 +419,6 @@ static void *stat_ptrs[STAT_NUM] = {
#if UDP_STATS #if UDP_STATS
&lwip_stats.udp.xmit, &lwip_stats.udp.xmit,
&lwip_stats.udp.rexmit,
&lwip_stats.udp.recv, &lwip_stats.udp.recv,
&lwip_stats.udp.fw, &lwip_stats.udp.fw,
&lwip_stats.udp.drop, &lwip_stats.udp.drop,
@ -450,7 +433,6 @@ static void *stat_ptrs[STAT_NUM] = {
#endif #endif
&lwip_stats.tcp.xmit, &lwip_stats.tcp.xmit,
&lwip_stats.tcp.rexmit,
&lwip_stats.tcp.recv, &lwip_stats.tcp.recv,
&lwip_stats.tcp.fw, &lwip_stats.tcp.fw,
&lwip_stats.tcp.drop, &lwip_stats.tcp.drop,

2
ports/unix/proj/unixsim/simhost.c
View File

@ -284,7 +284,7 @@ ping_recv(int s, struct ip_addr *addr)
len = lwip_recvfrom(s, buf,sizeof(buf),0,(struct sockaddr*)&from,&fromlen); len = lwip_recvfrom(s, buf,sizeof(buf),0,(struct sockaddr*)&from,&fromlen);
printf("Received %d bytes from %lx\n",len,ntohl(from.sin_addr.s_addr)); printf("Received %d bytes from %x\n",len,ntohl(from.sin_addr.s_addr));
} }
static void static void

6
ports/unix/sys_arch.c
View File

@ -172,8 +172,8 @@ sys_thread_new(char *name, void (* function)(void *arg), void *arg, int stacksiz
} }
if (NULL == st) { if (NULL == st) {
LWIP_DEBUGF(SYS_DEBUG, ("sys_thread_new: pthread_create %d, st = 0x%x", LWIP_DEBUGF(SYS_DEBUG, ("sys_thread_new: pthread_create %d, st = 0x%lx",
code, (int)st)); code, (unsigned long)st));
abort(); abort();
} }
return st; return st;
@ -588,7 +588,7 @@ sys_arch_unprotect(sys_prot_t pval)
#define HZ 100 #define HZ 100
#endif #endif
unsigned long u32_t
sys_jiffies(void) sys_jiffies(void)
{ {
struct timeval tv; struct timeval tv;