git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AcessNative - Now can use the `dir` CLIShell builtin
[tpg/acess2.git]
/
Modules
/
IPStack
/
main.c
diff --git
a/Modules/IPStack/main.c
b/Modules/IPStack/main.c
index
6349995
..
5f650b3
100644
(file)
--- a/
Modules/IPStack/main.c
+++ b/
Modules/IPStack/main.c
@@
-26,7
+26,7
@@
extern tRoute *IPStack_AddRoute(const char *Interface, void *Network, int Subnet
// === 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);
@@
-122,6
+122,10
@@
int IPStack_Install(char **Arguments)
// Route for addrData/iBits, no next hop, default metric
IPStack_AddRoute(iface->Name, iface->Address, iBits, NULL, 0);
// Route for addrData/iBits, no next hop, default metric
IPStack_AddRoute(iface->Name, iface->Address, iBits, NULL, 0);
+
+ Log_Notice("IPStack", "Boot interface %s/%i on %s",
+ IPStack_PrintAddress(iType, addrData), iBits,
+ dev);
}
continue;
}
continue;
@@
-218,17
+222,17
@@
int IPStack_GetAddressSize(int AddressType)
/**
* \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
// Sanity check size
- if( CheckBits < 0 ) CheckBits =
0
;
+ if( CheckBits < 0 ) CheckBits =
size*8
;
if( CheckBits > size*8 ) CheckBits = size*8;
if( CheckBits > size*8 ) CheckBits = size*8;
- if( CheckBits == 0 ) return 1; // /0 matches anythin
0
+ if( CheckBits == 0 ) return 1; // /0 matches anythin
g
// 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;
@@
-244,20
+248,20
@@
int IPStack_CompareAddress(int AddressType, void *Address1, void *Address2, int
return 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];
-
Uint8
*addr = Address;
+
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: {
+ 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]
UCC
git Repository :: git.ucc.asn.au