diff options
Diffstat (limited to '')
25 files changed, 94 insertions, 94 deletions
diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP.c index d2561b8fc7..fa57f98adb 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP.h index e9b1a29672..8965fe1ae6 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ARP.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ARP.c index 1dd4d72e20..eca655fe78 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ARP.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ARP.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -65,7 +65,7 @@ int sgIP_is_broadcast_address(sgIP_Hub_HWInterface * hw, unsigned long ipaddr) { } // this function will protect against malformed packets that could cause internal problems. -int sgIP_ARP_Check_isok(sgIP_Hub_HWInterface * hw, sgIP_memblock * mb, sgIP_Header_ARP * arp) { +int sgIP_ARP_Check_isok(sgIP_Hub_HWInterface * hw, sgIP_memblock * mb, sgIP_Header_ARP * arp) { return 1; // doesn't do anything yet ;) } @@ -184,7 +184,7 @@ int sgIP_ARP_SendProtocolFrame(sgIP_Hub_HWInterface * hw, sgIP_memblock * mb, un if(ArpRecords[i].queued_packet) { // if there is already a queued packet, reject the new one. sgIP_memblock_free(mb); return 0; // couldn't send. - } else { + } else { sgIP_memblock_exposeheader(mb,-14); // re-hide ethernet header. ArpRecords[i].queued_packet=mb; // queue packet. ArpRecords[i].linked_protocol=protocol; // queue packet. diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ARP.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ARP.h index 9c9e9ffd55..eda6e89d32 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ARP.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ARP.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -65,11 +65,11 @@ extern "C" { extern int sgIP_ARP_ProcessIPFrame(sgIP_Hub_HWInterface * hw, sgIP_memblock * mb); extern int sgIP_ARP_ProcessARPFrame(sgIP_Hub_HWInterface * hw, sgIP_memblock * mb); extern int sgIP_ARP_SendProtocolFrame(sgIP_Hub_HWInterface * hw, sgIP_memblock * mb, unsigned short protocol, unsigned long destaddr); - + extern int sgIP_ARP_SendARPResponse(sgIP_Hub_HWInterface * hw, sgIP_memblock * mb); extern int sgIP_ARP_SendGratARP(sgIP_Hub_HWInterface * hw); extern int sgIP_ARP_SendARPRequest(sgIP_Hub_HWInterface * hw, int protocol, unsigned long protocol_addr); - + #ifdef __cplusplus diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Config.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Config.h index cfcdcf7050..26772b0f40 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Config.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Config.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -33,14 +33,14 @@ SOFTWARE. // General options - these control the core functionality of the stack. // SGIP_USEDYNAMICMEMORY: Allows the stack to use memory as it needs it, via malloc()/free() -// This option is extremely useful in environments where it can be used, as it prevents the +// This option is extremely useful in environments where it can be used, as it prevents the // overhead of allocating per-connection memory in advance, and allows an unlimited number // of connections, provided the memory space. This option requires the implementation of -// two C functions, "void * sgIP_malloc(int)" and "void sgIP_free(void *)", which behave +// two C functions, "void * sgIP_malloc(int)" and "void sgIP_free(void *)", which behave // similarly to the malloc and free functions commonly used in C. #define SGIP_USEDYNAMICMEMORY -// SGIP_INTERRUPT_THREADING_MODEL: Provides memory protection in a system that can allow +// SGIP_INTERRUPT_THREADING_MODEL: Provides memory protection in a system that can allow // multiple processing "threads" by way of interrupts. This is not required on single // threaded systems, and not adequate on multithreaded systems, but provides a way to // allow protection against contention on interrupt-driven systems. This option requires @@ -52,7 +52,7 @@ SOFTWARE. // SGIP_MULTITHREADED_THREADING_MODEL: Standard memory protection for large multithreaded // systems, such as operating systems and the like. This kind of memory protection is -// useful for true multithreaded systems but useless in a single-threaded system and +// useful for true multithreaded systems but useless in a single-threaded system and // harmful in an interrupt-based multiprocess system. //#define SGIP_MULTITHREADED_THREADING_MODEL @@ -66,7 +66,7 @@ SOFTWARE. // received, however, in a memory-tight situation, much smaller values can be used. #define SGIP_MEMBLOCK_DATASIZE 1600 -// SGIP_MEMBLOCK_BASENUM: The starting number of memblocks that will be allocated. This is +// SGIP_MEMBLOCK_BASENUM: The starting number of memblocks that will be allocated. This is // also the total number of memblocks that will be allocated if sgIP is not configured to use // dynamic memory allocation. #define SGIP_MEMBLOCK_BASENUM 12 @@ -127,7 +127,7 @@ SOFTWARE. // (at least on most smaller systems) #define SGIP_ARP_MAXENTRIES 32 -// SGIP_HUB_MAXHWINTERFACES: The maximum number of hardware interfaces the sgIP hub will +// SGIP_HUB_MAXHWINTERFACES: The maximum number of hardware interfaces the sgIP hub will // connect to. A hardware interface being some port (ethernet, wifi, etc) that will relay // packets to the outside world. #define SGIP_HUB_MAXHWINTERFACES 1 @@ -198,7 +198,7 @@ SOFTWARE. #define SGIP_DEBUG_MESSAGE(param) sgIP_dbgprint param #define SGIP_DEBUG_ERROR(param) sgIP_dbgprint param; while(1); #else -#define SGIP_DEBUG_MESSAGE(param) +#define SGIP_DEBUG_MESSAGE(param) #define SGIP_DEBUG_ERROR(param) #endif diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DHCP.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DHCP.c index 8f6fa6d1ed..33805ba5e4 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DHCP.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DHCP.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -82,7 +82,7 @@ void sgIP_DHCP_BeginDgram(int dgramtype) { // ensure packet is zero'd.. seems to pacify some routers. malloc doesn't initialise the memory returned. memset(dhcp_p,0,sizeof(sgIP_DHCP_Packet)); - + dhcp_p->op=1; // 1==BOOTREQUEST dhcp_p->htype=1; // 1== ethernet address type dhcp_p->hlen=6; // hardware address length @@ -96,7 +96,7 @@ void sgIP_DHCP_BeginDgram(int dgramtype) { dhcp_p->giaddr=0; memcpy(dhcp_p->chaddr,dhcp_int->hwaddr,6); - + dhcp_optionptr=0; dhcp_p->options[dhcp_optionptr++]=0x63; dhcp_p->options[dhcp_optionptr++]=0x82; @@ -143,7 +143,7 @@ void sgIP_DHCP_BeginDgram(int dgramtype) { dhcp_p->options[dhcp_optionptr++]=0x3C; // DHCP Vendor Class ID dhcp_p->options[dhcp_optionptr++]=strlen(SGIP_DHCP_CLASSNAME); for(i=0;i<strlen(SGIP_DHCP_CLASSNAME);i++) { - dhcp_p->options[dhcp_optionptr++]=(SGIP_DHCP_CLASSNAME)[i]; + dhcp_p->options[dhcp_optionptr++]=(SGIP_DHCP_CLASSNAME)[i]; } // reason we don't send it immediately is in case the calling code wants to modify some data or add some options. @@ -177,7 +177,7 @@ void sgIP_DHCP_Start(sgIP_Hub_HWInterface * interface, int getDNS) { // begin dh bind(dhcp_socket,(struct sockaddr *)&sain,sizeof(sain)); i=1; ioctl(dhcp_socket,FIONBIO,&i); - + sgIP_DHCP_BeginDgram(DHCP_TYPE_DISCOVER); sgIP_DHCP_SendDgram(); } @@ -337,9 +337,9 @@ int gethostname(char *name, size_t len) if (name == NULL) return SGIP_ERROR(EFAULT); - if ( len <= size ) + if ( len <= size ) return SGIP_ERROR(EINVAL); - + strncpy(name, dhcp_hostname, size); name[size]=0; return 0; @@ -352,12 +352,12 @@ int sethostname(const char *name, size_t len) int size = sizeof(dhcp_hostname); if (name == NULL) return SGIP_ERROR(EFAULT); - - if ( len > size - 1) + + if ( len > size - 1) return SGIP_ERROR(EINVAL); - - rec = sgIP_DNS_FindDNSRecord(dhcp_hostname); - + + rec = sgIP_DNS_FindDNSRecord(dhcp_hostname); + strncpy(dhcp_hostname, name, len); dhcp_hostname[len]=0; strncpy(rec->aliases[0], name, len); diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DHCP.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DHCP.h index 505b700b23..ba980af362 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DHCP.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DHCP.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DNS.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DNS.c index cbc5ac8f6b..432236b205 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DNS.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DNS.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -122,7 +122,7 @@ int sgIP_DNS_isipaddress(const char * name, unsigned long * ipdest) { if(g[0]>=0x100 || g[1]>=0x1000000) return 0; out_addr= (g[0]<<24) | g[1]; break; - case 2: + case 2: if(g[0]>=0x100 || g[1]>=0x100 || g[2]>=0x10000) return 0; out_addr= (g[0]<<24) | (g[1]<<16) | g[2]; break; @@ -254,7 +254,7 @@ int sgIP_DNS_genquery(const char * name) { querydata_s[4]=0; // no nameserver records querydata_s[5]=0; // no additional records // question section - + querydata_c+=12; querydata_s+=6; j=0; @@ -338,7 +338,7 @@ sgIP_DNS_Hostent * sgIP_DNS_gethostbyname(const char * name) { if(dns_sock==-1) { hw=sgIP_Hub_GetDefaultInterface(); serverip=hw->dns[0]; - + dns_sock=socket(AF_INET,SOCK_DGRAM,0); i=1; i=ioctl(dns_sock,FIONBIO,&i); // set non-blocking @@ -398,7 +398,7 @@ dns_listenonly: return NULL; } - + resdata_c+=12; while(q) { // ignore questions do { @@ -414,7 +414,7 @@ dns_listenonly: naddr=0; rec=sgIP_DNS_GetUnusedRecord(); rec->flags=SGIP_DNS_FLAG_ACTIVE | SGIP_DNS_FLAG_BUSY; - while(a) { + while(a) { if(nalias<SGIP_DNS_MAXALIASES) sgIP_DNS_CopyAliasAt(rec->aliases[nalias++],resdata_c-responsedata); do { j=resdata_c[0]; @@ -473,7 +473,7 @@ unsigned long inet_addr(const char *cp) { int inet_aton(const char *cp, struct in_addr *inp) { unsigned long IP; - + if(sgIP_DNS_isipaddress(cp,&IP)) { inp->s_addr = IP; return 1; diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DNS.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DNS.h index 3ccfed11ed..2b23a2cec0 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DNS.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_DNS.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Hub.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Hub.c index 1b141b7129..e91de87ad4 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Hub.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Hub.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -123,7 +123,7 @@ int sgIP_Hub_ReceiveHardwarePacket(sgIP_Hub_HWInterface * hw, sgIP_memblock * pa // hide ethernet header for higher-level protocols sgIP_memblock_exposeheader(packet,-14); for(n=0;n<SGIP_HUB_MAXPROTOCOLINTERFACES;n++) { - if(ProtocolInterfaces[n].flags&SGIP_FLAG_PROTOCOL_ENABLED && ProtocolInterfaces[n].protocol==protocol) { // this protocol handler + if(ProtocolInterfaces[n].flags&SGIP_FLAG_PROTOCOL_ENABLED && ProtocolInterfaces[n].protocol==protocol) { // this protocol handler return ProtocolInterfaces[n].ReceivePacket(packet); } } @@ -147,13 +147,13 @@ int sgIP_Hub_SendProtocolPacket(int protocol, sgIP_memblock * packet, unsigned l // resolve protocol address to hardware address & send packet if( (src_address & hw->snmask) == (dest_address & hw->snmask) // on same network || dest_address == 0xFFFFFFFF ) // or broadcast address, send directly. - { + { return sgIP_ARP_SendProtocolFrame(hw,packet,protocol,dest_address); } else { // eek, on different network. Send to gateway return sgIP_ARP_SendProtocolFrame(hw,packet,protocol,hw->gateway); } } -// send packet on a hardware interface. +// send packet on a hardware interface. int sgIP_Hub_SendRawPacket(sgIP_Hub_HWInterface * hw, sgIP_memblock * packet) { if(!hw || !packet) return 0; if(hw->flags&SGIP_FLAG_HWINTERFACE_ENABLED) { diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Hub.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Hub.h index fd1305524f..f8df3a0cea 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Hub.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_Hub.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -69,7 +69,7 @@ typedef struct SGIP_HUB_HWINTERFACE { typedef struct SGIP_HEADER_ETHERNET { unsigned char dest_mac[6]; unsigned char src_mac[6]; - unsigned short protocol; + unsigned short protocol; } sgIP_Header_Ethernet; #define ntohs(num) htons(num) diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ICMP.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ICMP.c index 57143c5efe..9595d844d3 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ICMP.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ICMP.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ICMP.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ICMP.h index e934609510..e9513b55ba 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ICMP.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_ICMP.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_IP.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_IP.c index 595516b4da..d145ba4d92 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_IP.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_IP.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -47,7 +47,7 @@ int sgIP_IP_ReceivePacket(sgIP_memblock * mb) { SGIP_DEBUG_MESSAGE(("-%i/%i",mb->totallength,htons(iphdr->tot_length))); sgIP_memblock_free(mb); return 0; // bad size. - } + } sgIP_memblock_trimsize(mb,htons(iphdr->tot_length)); // check version if((iphdr->version_ihl>>4)!=4) { diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_IP.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_IP.h index 4d579569cf..d6b047429d 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_IP.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_IP.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_TCP.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_TCP.c index a513735645..92e63ec6ba 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_TCP.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_TCP.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -32,7 +32,7 @@ sgIP_Record_TCP * tcprecords; int port_counter; unsigned long lasttime; extern unsigned long volatile sgIP_timems; -sgIP_TCP_SYNCookie synlist[SGIP_TCP_MAXSYNS]; +sgIP_TCP_SYNCookie synlist[SGIP_TCP_MAXSYNS]; int numsynlist; // number of active entries in synlist (earliest first) @@ -54,7 +54,7 @@ void sgIP_TCP_Timer() { // scan through tcp records and resend anything necessar synlist[i].timebackoff*=2; if(synlist[i].timebackoff>SGIP_TCP_BACKOFFMAX) synlist[i].timebackoff=SGIP_TCP_BACKOFFMAX; if(j>synlist[i].timebackoff) synlist[i].timenext=0; else synlist[i].timenext=synlist[i].timebackoff-j; - // resend SYN + // resend SYN sgIP_TCP_SendSynReply(SGIP_TCP_FLAG_SYN|SGIP_TCP_FLAG_ACK,synlist[i].localseq,synlist[i].remoteseq,synlist[i].localip,synlist[i].remoteip,synlist[i].localport,synlist[i].remoteport,-1); } else { synlist[i].timenext-=time; @@ -82,7 +82,7 @@ void sgIP_TCP_Timer() { // scan through tcp records and resend anything necessar j=rec->time_backoff; j*=2; if(j>SGIP_TCP_BACKOFFMAX) j=SGIP_TCP_BACKOFFMAX; - sgIP_TCP_SendPacket(rec,SGIP_TCP_FLAG_SYN,0); + sgIP_TCP_SendPacket(rec,SGIP_TCP_FLAG_SYN,0); rec->time_backoff=j; // preserve backoff } break; @@ -100,7 +100,7 @@ void sgIP_TCP_Timer() { // scan through tcp records and resend anything necessar } j=rec->buf_tx_out-rec->buf_tx_in; if(j<0) j+=SGIP_TCP_TRANSMITBUFFERLENGTH; - j+=(int)(rec->sequence-rec->sequence_next); + j+=(int)(rec->sequence-rec->sequence_next); if(j>0) {// never-sent bytes if(time>SGIP_TCP_TRANSMIT_DELAY) { // 1000 is an arbitrary constant. j=rec->buf_tx_out-rec->buf_tx_in; @@ -182,7 +182,7 @@ void sgIP_TCP_Timer() { // scan through tcp records and resend anything necessar rec->tcpstate=SGIP_TCP_STATE_CLOSED; } break; - } + } rec=rec->next; @@ -266,17 +266,17 @@ int sgIP_TCP_ReceivePacket(sgIP_memblock * mb, unsigned long srcip, unsigned lon if(tcp->tcpflags&SGIP_TCP_FLAG_ACK) { int i,j; for(i=0;i<numsynlist;i++) { - if(synlist[i].localseq+1==tcpack) { // oki! this is probably legit ;) + if(synlist[i].localseq+1==tcpack) { // oki! this is probably legit ;) rec=synlist[i].linked; // we have the data we need. // remove entry from synlist numsynlist--; i*=3; for(;i<numsynlist;i++) { synlist[i]=synlist[i+1]; // assume struct copy - } + } for(j=0;j<rec->maxlisten;j++) if(!rec->listendata[j]) break; // find last entry in listen queue if(j==rec->maxlisten) { rec=0; break; } // discard this connection! we have no space in the listen queue. - + rec->listendata[j]=sgIP_TCP_AllocRecord(); j++; if(j!=rec->maxlisten) rec->listendata[j]=0; @@ -298,7 +298,7 @@ int sgIP_TCP_ReceivePacket(sgIP_memblock * mb, unsigned long srcip, unsigned lon rec->txwindow=rec->sequence+htons(tcp->window); sgIP_memblock_free(mb); - return 0; + return 0; } } } @@ -382,7 +382,7 @@ int sgIP_TCP_ReceivePacket(sgIP_memblock * mb, unsigned long srcip, unsigned lon delta1=(int)(tcpseq-rec->ack); if(delta1<0) { // data is partly ack'd...just copy what we need. datastart-=delta1; - datalen+=delta1; + datalen+=delta1; } // copy data into the fifo rec->ack+=datalen; @@ -424,7 +424,7 @@ int sgIP_TCP_ReceivePacket(sgIP_memblock * mb, unsigned long srcip, unsigned lon numsynlist--; for(delta1=0;delta1<numsynlist;delta1++) { synlist[delta1]=synlist[delta1+1]; // assume struct copy - } + } } { unsigned long myseq,myport; @@ -453,7 +453,7 @@ int sgIP_TCP_ReceivePacket(sgIP_memblock * mb, unsigned long srcip, unsigned lon sgIP_TCP_SendPacket(rec,SGIP_TCP_FLAG_ACK,0); rec->tcpstate=SGIP_TCP_STATE_ESTABLISHED; rec->retrycount=0; - break; + break; case SGIP_TCP_FLAG_SYN: // just got a syn... rec->ack=tcpseq+1; rec->sequence=tcpack; @@ -479,7 +479,7 @@ int sgIP_TCP_ReceivePacket(sgIP_memblock * mb, unsigned long srcip, unsigned lon rec->tcpstate=SGIP_TCP_STATE_CLOSE_WAIT; rec->ack=tcpseq+datalen+1; sgIP_TCP_SendPacket(rec,SGIP_TCP_FLAG_ACK,0); - + } break; case SGIP_TCP_STATE_FIN_WAIT_1: // sent a FIN, haven't got FIN or ACK yet. @@ -819,7 +819,7 @@ int sgIP_TCP_Connect(sgIP_Record_TCP * rec, unsigned long destip, int destport) rec->srcip=sgIP_IP_GetLocalBindAddr(0,destip); rec->srcport=htons(sgIP_TCP_GetUnusedOutgoingPort()); rec->destip=destip; - rec->destport=destport; + rec->destport=destport; } else if(rec->tcpstate==SGIP_TCP_STATE_UNUSED) { // already bound to a local address. rec->srcip=sgIP_IP_GetLocalBindAddr(rec->srcip,destip); rec->destip=destip; @@ -874,14 +874,14 @@ int sgIP_TCP_Send(sgIP_Record_TCP * rec, const char * datatosend, int datalength } SGIP_INTR_UNPROTECT(); if(datalength==0) return SGIP_ERROR(EWOULDBLOCK); - return datalength; + return datalength; } int sgIP_TCP_Recv(sgIP_Record_TCP * rec, char * databuf, int buflength, int flags) { if(!rec || !databuf) return SGIP_ERROR(EINVAL); //error if(rec->buf_rx_in==rec->buf_rx_out) { if(rec->tcpstate==SGIP_TCP_STATE_CLOSED || rec->tcpstate==SGIP_TCP_STATE_CLOSE_WAIT) { if(rec->errorcode) return SGIP_ERROR(rec->errorcode); - return SGIP_ERROR0(ESHUTDOWN); + return SGIP_ERROR0(ESHUTDOWN); } return SGIP_ERROR(EWOULDBLOCK); //error no data } diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_TCP.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_TCP.h index 3c5f8ac8ff..4e4e649b46 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_TCP.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_TCP.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -99,7 +99,7 @@ typedef struct SGIP_TCP_SYNCOOKIE { unsigned long localseq, remoteseq; unsigned long localip, remoteip; unsigned short localport, remoteport; - unsigned long timenext,timebackoff; + unsigned long timenext,timebackoff; sgIP_Record_TCP * linked; // parent listening connection } sgIP_TCP_SYNCookie; diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_UDP.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_UDP.c index 2e3be7fc19..9b4ef807cd 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_UDP.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_UDP.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -204,7 +204,7 @@ int sgIP_UDP_Bind(sgIP_Record_UDP * rec, int srcport, unsigned long srcip) { int sgIP_UDP_RecvFrom(sgIP_Record_UDP * rec, char * destbuf, int buflength, int flags, unsigned long * sender_ip, unsigned short * sender_port) { if(!rec || !destbuf || !sender_ip || !sender_port || buflength==0) return SGIP_ERROR(EINVAL); SGIP_INTR_PROTECT(); - if(rec->incoming_queue==0) { + if(rec->incoming_queue==0) { SGIP_INTR_UNPROTECT(); return SGIP_ERROR(EWOULDBLOCK); } @@ -234,7 +234,7 @@ int sgIP_UDP_RecvFrom(sgIP_Record_UDP * rec, char * destbuf, int buflength, int sgIP_memblock_free(mb); } if(!(rec->incoming_queue)) rec->incoming_queue_end=0; - + SGIP_INTR_UNPROTECT(); return buf_start; } diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_UDP.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_UDP.h index ea90adbca2..676cd7b6d4 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_UDP.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_UDP.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -50,7 +50,7 @@ typedef struct SGIP_RECORD_UDP { unsigned long srcip; unsigned long destip; unsigned short srcport,destport; - + sgIP_memblock * incoming_queue; sgIP_memblock * incoming_queue_end; diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_memblock.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_memblock.c index 474b9f2192..b68918033b 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_memblock.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_memblock.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_memblock.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_memblock.h index dfbf1bcbb5..85d6011364 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_memblock.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_memblock.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_sockets.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_sockets.c index 026dbd2d25..e75ee42cf4 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_sockets.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_sockets.c @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -82,7 +82,7 @@ int socket(int domain, int type, int protocol) { socketlist[s].conn_ptr=sgIP_TCP_AllocRecord(); } else if(type==SOCK_DGRAM) { socketlist[s].flags=SGIP_SOCKET_FLAG_ACTIVE | SGIP_SOCKET_FLAG_TYPE_UDP; - socketlist[s].conn_ptr=sgIP_UDP_AllocRecord(); + socketlist[s].conn_ptr=sgIP_UDP_AllocRecord(); } else { SGIP_INTR_UNPROTECT(); return SGIP_ERROR(EINVAL); @@ -138,7 +138,7 @@ int connect(int socket, const struct sockaddr * addr, int addr_len) { do { i=((sgIP_Record_TCP *)socketlist[socket].conn_ptr)->tcpstate; if(i==SGIP_TCP_STATE_ESTABLISHED || i==SGIP_TCP_STATE_CLOSE_WAIT) {retval=0; break;} - if(i==SGIP_TCP_STATE_CLOSED || i==SGIP_TCP_STATE_UNUSED || i==SGIP_TCP_STATE_LISTEN || i==SGIP_TCP_STATE_NODATA) + if(i==SGIP_TCP_STATE_CLOSED || i==SGIP_TCP_STATE_UNUSED || i==SGIP_TCP_STATE_LISTEN || i==SGIP_TCP_STATE_NODATA) { retval=SGIP_ERROR(((sgIP_Record_TCP *)socketlist[socket].conn_ptr)->errorcode); break; } if(socketlist[socket].flags&SGIP_SOCKET_FLAG_NONBLOCKING) break; SGIP_INTR_UNPROTECT(); @@ -316,7 +316,7 @@ int ioctl(int socket, long cmd, void * arg) { int setsockopt(int socket, int level, int option_name, const void * data, int data_len) { return 0; -} +} int getsockopt(int socket, int level, int option_name, void * data, int * data_len) { return 0; } diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_sockets.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_sockets.h index 8ec6055b44..a48e2dc467 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_sockets.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/sgIP_sockets.h @@ -1,6 +1,6 @@ // DSWifi Project - sgIP Internet Protocol Stack Implementation // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c index 5ec5a4a6af..a21b659e4e 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.c @@ -1,7 +1,7 @@ // DS Wifi interface code // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org // wifi_arm9.c - arm9 wifi support code -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair @@ -166,7 +166,7 @@ void * wHeapAlloc(int size) { } } #endif - return voidptr; + return voidptr; } void wHeapFree(void * data) { @@ -477,7 +477,7 @@ int Wifi_ConnectAP(Wifi_AccessPoint * apdata, int wepmode, int wepkeyid, u8 * we WifiData->reqReqFlags |= WFLAG_REQ_APCONNECT | WFLAG_REQ_APCOPYVALUES; wifi_connect_state=1; } else { - WifiData->reqMode=WIFIMODE_SCAN; + WifiData->reqMode=WIFIMODE_SCAN; wifi_connect_point = *apdata; } return 0; @@ -487,7 +487,7 @@ void Wifi_AutoConnect(void) { wifi_connect_state=ASSOCSTATUS_CANNOTCONNECT; } else { wifi_connect_state=4; - WifiData->reqMode=WIFIMODE_SCAN; + WifiData->reqMode=WIFIMODE_SCAN; } } @@ -498,7 +498,7 @@ void sgIP_DNS_Record_Localhost(void) const unsigned char * resdata_c = (unsigned char *)&(wifi_hw->ipaddr); rec = sgIP_DNS_GetUnusedRecord(); rec->flags=SGIP_DNS_FLAG_ACTIVE | SGIP_DNS_FLAG_BUSY; - + rec->addrlen = 4; rec->numalias = 1; gethostname(rec->aliases[0], 256); @@ -519,7 +519,7 @@ int Wifi_AssocStatus() { case -1: // error return ASSOCSTATUS_CANNOTCONNECT; case 0: // searching - { + { int i; Wifi_AccessPoint ap; i=Wifi_FindMatchingAP(1,&wifi_connect_point,&ap); @@ -611,7 +611,7 @@ int Wifi_AssocStatus() { } } } -#else +#else // should never get here (dhcp state) without sgIP! Wifi_DisconnectAP(); wifi_connect_state=-1; @@ -692,7 +692,7 @@ int Wifi_TransmitFunction(sgIP_Hub_HWInterface * hw, sgIP_memblock * mb) { sgIP_memblock_free(mb); return 0; //? } - + ethhdr_print('T',mb->datastart); framehdr[0]=0; framehdr[1]=0; @@ -803,22 +803,22 @@ unsigned long Wifi_Init(int initflags) { case WIFIINIT_OPTION_USEHEAP_128: wHeapAllocInit(128*1024); break; - case WIFIINIT_OPTION_USEHEAP_64: + case WIFIINIT_OPTION_USEHEAP_64: wHeapAllocInit(64*1024); break; - case WIFIINIT_OPTION_USEHEAP_256: + case WIFIINIT_OPTION_USEHEAP_256: wHeapAllocInit(256*1024); break; - case WIFIINIT_OPTION_USEHEAP_512: + case WIFIINIT_OPTION_USEHEAP_512: wHeapAllocInit(512*1024); break; case WIFIINIT_OPTION_USECUSTOMALLOC: break; } sgIP_Init(); - + #endif - + WifiData->flags9 = WFLAG_ARM9_ACTIVE | (initflags & WFLAG_ARM9_INITFLAGMASK) ; return (u32) &Wifi_Data_Struct; } @@ -874,7 +874,7 @@ void Wifi_Update() { // destination matches our mac address, or the broadcast address. //if(framehdr[6]&0x4000) { // wep enabled (when receiving WEP packets, the IV is stripped for us! how nice :| // base2+=24; hdrlen=28; // base2+=[wifi hdr 12byte]+[802 header hdrlen]+[slip hdr 8byte] - //} else { + //} else { base2+=22; hdrlen=24; //} // SGIP_DEBUG_MESSAGE(("%04X %04X %04X %04X %04X",Wifi_RxReadOffset(base2-8,0),Wifi_RxReadOffset(base2-7,0),Wifi_RxReadOffset(base2-6,0),Wifi_RxReadOffset(base2-5,0),Wifi_RxReadOffset(base2-4,0))); diff --git a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.h b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.h index e8f351d07c..3b354636cd 100644 --- a/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.h +++ b/c/src/lib/libbsp/arm/nds/dswifi/arm9/source/wifi_arm9.h @@ -1,7 +1,7 @@ // DS Wifi interface code // Copyright (C) 2005-2006 Stephen Stair - sgstair@akkit.org - http://www.akkit.org // wifi_arm9.c - arm9 wifi support header -/****************************************************************************** +/****************************************************************************** DSWifi Lib and test materials are licenced under the MIT open source licence: Copyright (c) 2005-2006 Stephen Stair |