summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c967d91)
- IPv6 fiddling
- Fixed some const-ness
extern int IPStack_AddFile(tSocketFile *File);
extern int IPStack_GetAddressSize(int AddressType);
extern int IPStack_AddFile(tSocketFile *File);
extern int IPStack_GetAddressSize(int AddressType);
-extern int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int CheckBits);
-extern const char *IPStack_PrintAddress(int AddressType, void *Address);
+extern int IPStack_CompareAddress(int AddressType, const void *Address1, const void *Address2, int CheckBits);
+extern const char *IPStack_PrintAddress(int AddressType, const void *Address);
extern tRoute *IPStack_FindRoute(int AddressType, tInterface *Interface, void *Address);
extern tRoute *IPStack_FindRoute(int AddressType, tInterface *Interface, void *Address);
hdr->HopLimit --;
rt = IPStack_FindRoute(6, NULL, &hdr->Destination); // Get the route (gets the interface)
hdr->HopLimit --;
rt = IPStack_FindRoute(6, NULL, &hdr->Destination); // Get the route (gets the interface)
- //to = ARP_Resolve6(rt->Interface, hdr->Destination); // Resolve address
+ to = ICMP6_ResolveHWAddr(rt->Interface, hdr->Destination); // Resolve address
// Send packet
Log_Log("IPv6", "Forwarding packet");
// Send packet
Log_Log("IPv6", "Forwarding packet");
// === PROTOTYPES ===
int IPStack_Install(char **Arguments);
// === PROTOTYPES ===
int IPStack_Install(char **Arguments);
- int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int CheckBits);
+ int IPStack_CompareAddress(int AddressType, const void *Address1, const void *Address2, int CheckBits);
// === GLOBALS ===
MODULE_DEFINE(0, VERSION, IPStack, IPStack_Install, NULL, NULL);
// === GLOBALS ===
MODULE_DEFINE(0, VERSION, IPStack, IPStack_Install, NULL, NULL);
/**
* \brief Compare two IP Addresses masked by CheckBits
*/
/**
* \brief Compare two IP Addresses masked by CheckBits
*/
-int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int CheckBits)
+int IPStack_CompareAddress(int AddressType, const void *Address1, const void *Address2, int CheckBits)
{
int size = IPStack_GetAddressSize(AddressType);
Uint8 mask;
{
int size = IPStack_GetAddressSize(AddressType);
Uint8 mask;
- Uint8 *addr1 = Address1, *addr2 = Address2;
+ const Uint8 *addr1 = Address1, *addr2 = Address2;
// Sanity check size
if( CheckBits < 0 ) CheckBits = 0;
if( CheckBits > size*8 ) CheckBits = size*8;
// Sanity check size
if( CheckBits < 0 ) CheckBits = 0;
if( CheckBits > size*8 ) CheckBits = size*8;
- if( CheckBits == 0 ) return 1; // /0 matches anythin0
+ if( CheckBits == 0 ) return 1; // /0 matches anything
// Check first bits/8 bytes
if( memcmp(Address1, Address2, CheckBits/8) != 0 ) return 0;
// Check first bits/8 bytes
if( memcmp(Address1, Address2, CheckBits/8) != 0 ) return 0;
-const char *IPStack_PrintAddress(int AddressType, void *Address)
+const char *IPStack_PrintAddress(int AddressType, const void *Address)
{
switch( AddressType )
{
case 4: {
static char ret[4*3+3+1];
{
switch( AddressType )
{
case 4: {
static char ret[4*3+3+1];
+ const Uint8 *addr = Address;
sprintf(ret, "%i.%i.%i.%i", addr[0], addr[1], addr[2], addr[3]);
return ret;
}
sprintf(ret, "%i.%i.%i.%i", addr[0], addr[1], addr[2], addr[3]);
return ret;
}
+ case 6: { // TODO: address compression
static char ret[8*4+7+1];
static char ret[8*4+7+1];
- Uint16 *addr = Address;
+ const Uint16 *addr = Address;
sprintf(ret, "%x:%x:%x:%x:%x:%x:%x:%x",
addr[0], addr[1], addr[2], addr[3],
addr[4], addr[5], addr[6], addr[7]
sprintf(ret, "%x:%x:%x:%x:%x:%x:%x:%x",
addr[0], addr[1], addr[2], addr[3],
addr[4], addr[5], addr[6], addr[7]
#define TCP_RECIEVE_BUFFER_SIZE 0x4000
// === PROTOTYPES ===
#define TCP_RECIEVE_BUFFER_SIZE 0x4000
// === PROTOTYPES ===
+void TCP_Initialise(void);
void TCP_StartConnection(tTCPConnection *Conn);
void TCP_SendPacket(tTCPConnection *Conn, size_t Length, tTCPHeader *Data);
void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer);
void TCP_StartConnection(tTCPConnection *Conn);
void TCP_SendPacket(tTCPConnection *Conn, size_t Length, tTCPHeader *Data);
void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer);
*
* Registers the client and server files and the GetPacket callback
*/
*
* Registers the client and server files and the GetPacket callback
*/
+void TCP_Initialise(void)
{
IPStack_AddFile(&gTCP_ServerFile);
IPStack_AddFile(&gTCP_ClientFile);
{
IPStack_AddFile(&gTCP_ServerFile);
IPStack_AddFile(&gTCP_ClientFile);