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
Fixing to get x86_64 build to compile after threading overhaul
[tpg/acess2.git]
/
Modules
/
IPStack
/
ipstack.h
diff --git
a/Modules/IPStack/ipstack.h
b/Modules/IPStack/ipstack.h
index
54d8fb8
..
4395394
100644
(file)
--- a/
Modules/IPStack/ipstack.h
+++ b/
Modules/IPStack/ipstack.h
@@
-23,6
+23,7
@@
union uIPv4 {
} __attribute__((packed));
union uIPv6 {
} __attribute__((packed));
union uIPv6 {
+ Uint16 W[8];
Uint32 L[4];
Uint8 B[16];
} __attribute__((packed));
Uint32 L[4];
Uint8 B[16];
} __attribute__((packed));
@@
-35,7
+36,7
@@
struct sInterface {
struct sInterface *Next;
tVFS_Node Node;
tAdapter *Adapter;
struct sInterface *Next;
tVFS_Node Node;
tAdapter *Adapter;
- int TimeoutDelay; // Time in miliseconds before a
connection
times out
+ int TimeoutDelay; // Time in miliseconds before a
packet
times out
int Type; // 0 for disabled, 4 for IPv4 and 6 for IPv6
union {
struct {
int Type; // 0 for disabled, 4 for IPv4 and 6 for IPv6
union {
struct {
@@
-61,6
+62,7
@@
struct sAdapter {
int NRef;
tMacAddr MacAddr;
int NRef;
tMacAddr MacAddr;
+ int DeviceLen;
char Device[];
};
char Device[];
};
@@
-81,17
+83,17
@@
static const tMacAddr cMAC_BROADCAST = {{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}};
#define IP4_SET(t,v) (t).L = (v).L;
#define IP6_SET(t,v) memcpy(&(t),&(v),sizeof(tIPv6))
#define IP4_SET(t,v) (t).L = (v).L;
#define IP6_SET(t,v) memcpy(&(t),&(v),sizeof(tIPv6))
-#define MAC_EQU(a,b)
memcmp(&(a),&(b),sizeof(tMacAddr)
)
+#define MAC_EQU(a,b)
(memcmp(&(a),&(b),sizeof(tMacAddr))==0
)
#define IP4_EQU(a,b) ((a).L==(b).L)
#define IP4_EQU(a,b) ((a).L==(b).L)
-#define IP6_EQU(a,b)
memcmp(&(a),&(b),sizeof(tIPv6)
)
+#define IP6_EQU(a,b)
(memcmp(&(a),&(b),sizeof(tIPv6))==0
)
// === FUNCTIONS ===
#define htonb(v) (v)
// === FUNCTIONS ===
#define htonb(v) (v)
-#define htons(
in) BigEndian16(in
)
-#define htonl(
in) BigEndian32(in
)
+#define htons(
v) BigEndian16(v
)
+#define htonl(
v) BigEndian32(v
)
#define ntonb(v) (v)
#define ntonb(v) (v)
-#define ntohs(
in) BigEndian16(in
)
-#define ntohl(
in) BigEndian32(in
)
+#define ntohs(
v) BigEndian16(v
)
+#define ntohl(
v) BigEndian32(v
)
extern int IPStack_AddFile(tSocketFile *File);
extern int IPStack_AddFile(tSocketFile *File);
UCC
git Repository :: git.ucc.asn.au