skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-22 12:33:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Fix checkpatch errors in core/rtw_br_ext.c

Browse source 
There are CHECKS and WARNINGS remaining.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-27 13:27:48 -05:00
parent 954eab3527
commit 29ada234b0
1 changed files with 466 additions and 655 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

377
core/rtw_br_ext.c
View file

@ -70,7 +70,7 @@
/* Find a tag in pppoe frame and return the pointer */ /* Find a tag in pppoe frame and return the pointer */
static __inline__ unsigned char *__nat25_find_pppoe_tag(struct pppoe_hdr *ph, unsigned short type) static inline unsigned char *__nat25_find_pppoe_tag(struct pppoe_hdr *ph, unsigned short type)
{ {
unsigned char *cur_ptr, *start_ptr; unsigned char *cur_ptr, *start_ptr;
unsigned short tagLen, tagType; unsigned short tagLen, tagType;
@ -88,7 +88,7 @@ static __inline__ unsigned char *__nat25_find_pppoe_tag(struct pppoe_hdr *ph, un
} }
static __inline__ int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_tag *tag) static inline int __nat25_add_pppoe_tag(struct sk_buff *skb, struct pppoe_tag *tag)
{ {
struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN); struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN);
int data_len; int data_len;
@ -128,7 +128,7 @@ static int skb_pull_and_merge(struct sk_buff *skb, unsigned char *src, int len)
return 0; return 0;
} }
static __inline__ unsigned long __nat25_timeout(struct adapter *priv) static inline unsigned long __nat25_timeout(struct adapter *priv)
{ {
unsigned long timeout; unsigned long timeout;
@ -138,7 +138,7 @@ static __inline__ unsigned long __nat25_timeout(struct adapter *priv)
} }
static __inline__ int __nat25_has_expired(struct adapter *priv, static inline int __nat25_has_expired(struct adapter *priv,
struct nat25_network_db_entry *fdb) struct nat25_network_db_entry *fdb)
{ {
if (time_before_eq(fdb->ageing_timer, __nat25_timeout(priv))) if (time_before_eq(fdb->ageing_timer, __nat25_timeout(priv)))
@ -148,7 +148,7 @@ static __inline__ int __nat25_has_expired(struct adapter *priv,
} }
static __inline__ void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr, static inline void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr,
unsigned int *ipAddr) unsigned int *ipAddr)
{ {
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
@ -158,7 +158,7 @@ static __inline__ void __nat25_generate_ipv4_network_addr(unsigned char *network
} }
static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr, static inline void __nat25_generate_ipx_network_addr_with_node(unsigned char *networkAddr,
unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr) unsigned int *ipxNetAddr, unsigned char *ipxNodeAddr)
{ {
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
@ -169,7 +169,7 @@ static __inline__ void __nat25_generate_ipx_network_addr_with_node(unsigned char
} }
static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr, static inline void __nat25_generate_ipx_network_addr_with_socket(unsigned char *networkAddr,
unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr) unsigned int *ipxNetAddr, unsigned short *ipxSocketAddr)
{ {
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
@ -180,7 +180,7 @@ static __inline__ void __nat25_generate_ipx_network_addr_with_socket(unsigned ch
} }
static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networkAddr, static inline void __nat25_generate_apple_network_addr(unsigned char *networkAddr,
unsigned short *network, unsigned char *node) unsigned short *network, unsigned char *node)
{ {
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
@ -190,8 +190,7 @@ static __inline__ void __nat25_generate_apple_network_addr(unsigned char *networ
networkAddr[3] = *node; networkAddr[3] = *node;
} }
static inline void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
static __inline__ void __nat25_generate_pppoe_network_addr(unsigned char *networkAddr,
unsigned char *ac_mac, unsigned short *sid) unsigned char *ac_mac, unsigned short *sid)
{ {
memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN); memset(networkAddr, 0, MAX_NETWORK_ADDR_LEN);
@ -297,35 +296,28 @@ static void convert_ipv6_mac_to_mc(struct sk_buff *skb)
memcpy(&dst_mac[2], &iph->daddr.s6_addr32[3], 4); memcpy(&dst_mac[2], &iph->daddr.s6_addr32[3], 4);
} }
static __inline__ int __nat25_network_hash(unsigned char *networkAddr) static inline int __nat25_network_hash(unsigned char *networkAddr)
{
if (networkAddr[0] == NAT25_IPV4)
{ {
if (networkAddr[0] == NAT25_IPV4) {
unsigned long x; unsigned long x;
x = networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10]; x = networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10];
return x & (NAT25_HASH_SIZE - 1); return x & (NAT25_HASH_SIZE - 1);
} } else if (networkAddr[0] == NAT25_IPX) {
else if (networkAddr[0] == NAT25_IPX)
{
unsigned long x; unsigned long x;
x = networkAddr[1] ^ networkAddr[2] ^ networkAddr[3] ^ networkAddr[4] ^ networkAddr[5] ^ x = networkAddr[1] ^ networkAddr[2] ^ networkAddr[3] ^ networkAddr[4] ^ networkAddr[5] ^
networkAddr[6] ^ networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10]; networkAddr[6] ^ networkAddr[7] ^ networkAddr[8] ^ networkAddr[9] ^ networkAddr[10];
return x & (NAT25_HASH_SIZE - 1); return x & (NAT25_HASH_SIZE - 1);
} } else if (networkAddr[0] == NAT25_APPLE) {
else if (networkAddr[0] == NAT25_APPLE)
{
unsigned long x; unsigned long x;
x = networkAddr[1] ^ networkAddr[2] ^ networkAddr[3]; x = networkAddr[1] ^ networkAddr[2] ^ networkAddr[3];
return x & (NAT25_HASH_SIZE - 1); return x & (NAT25_HASH_SIZE - 1);
} } else if (networkAddr[0] == NAT25_PPPOE) {
else if (networkAddr[0] == NAT25_PPPOE)
{
unsigned long x; unsigned long x;
x = networkAddr[0] ^ networkAddr[1] ^ networkAddr[2] ^ networkAddr[3] ^ networkAddr[4] ^ networkAddr[5] ^ networkAddr[6] ^ networkAddr[7] ^ networkAddr[8]; x = networkAddr[0] ^ networkAddr[1] ^ networkAddr[2] ^ networkAddr[3] ^ networkAddr[4] ^ networkAddr[5] ^ networkAddr[6] ^ networkAddr[7] ^ networkAddr[8];
@ -351,39 +343,27 @@ static __inline__ int __nat25_network_hash(unsigned char *networkAddr)
} }
} }
static __inline__ void __network_hash_link(struct adapter *priv, static inline void __network_hash_link(struct adapter *priv,
struct nat25_network_db_entry *ent, int hash) struct nat25_network_db_entry *ent, int hash)
{ {
/* Caller must _enter_critical_bh already! */ /* Caller must _enter_critical_bh already! */
/* unsigned long irqL; */
/* _enter_critical_bh(&priv->br_ext_lock, &irqL); */
ent->next_hash = priv->nethash[hash]; ent->next_hash = priv->nethash[hash];
if (ent->next_hash != NULL) if (ent->next_hash != NULL)
ent->next_hash->pprev_hash = &ent->next_hash; ent->next_hash->pprev_hash = &ent->next_hash;
priv->nethash[hash] = ent; priv->nethash[hash] = ent;
ent->pprev_hash = &priv->nethash[hash]; ent->pprev_hash = &priv->nethash[hash];
/* _exit_critical_bh(&priv->br_ext_lock, &irqL); */
} }
static inline void __network_hash_unlink(struct nat25_network_db_entry *ent)
static __inline__ void __network_hash_unlink(struct nat25_network_db_entry *ent)
{ {
/* Caller must _enter_critical_bh already! */ /* Caller must _enter_critical_bh already! */
/* unsigned long irqL; */
/* _enter_critical_bh(&priv->br_ext_lock, &irqL); */
*(ent->pprev_hash) = ent->next_hash; *(ent->pprev_hash) = ent->next_hash;
if (ent->next_hash != NULL) if (ent->next_hash != NULL)
ent->next_hash->pprev_hash = ent->pprev_hash; ent->next_hash->pprev_hash = ent->pprev_hash;
ent->next_hash = NULL; ent->next_hash = NULL;
ent->pprev_hash = NULL; ent->pprev_hash = NULL;
/* _exit_critical_bh(&priv->br_ext_lock, &irqL); */
} }
static int __nat25_db_network_lookup_and_replace(struct adapter *priv, static int __nat25_db_network_lookup_and_replace(struct adapter *priv,
struct sk_buff *skb, unsigned char *networkAddr) struct sk_buff *skb, unsigned char *networkAddr)
{ {
@ -392,12 +372,9 @@ static int __nat25_db_network_lookup_and_replace(struct adapter *priv,
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
db = priv->nethash[__nat25_network_hash(networkAddr)]; db = priv->nethash[__nat25_network_hash(networkAddr)];
while (db != NULL) while (db != NULL) {
{ if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) {
if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) if (!__nat25_has_expired(priv, db)) {
{
if (!__nat25_has_expired(priv, db))
{
/* replace the destination mac address */ /* replace the destination mac address */
memcpy(skb->data, db->macAddr, ETH_ALEN); memcpy(skb->data, db->macAddr, ETH_ALEN);
atomic_inc(&db->use_count); atomic_inc(&db->use_count);
@ -431,10 +408,8 @@ static int __nat25_db_network_lookup_and_replace(struct adapter *priv,
_exit_critical_bh(&priv->br_ext_lock, &irqL); _exit_critical_bh(&priv->br_ext_lock, &irqL);
return 1; return 1;
} }
db = db->next_hash; db = db->next_hash;
} }
_exit_critical_bh(&priv->br_ext_lock, &irqL); _exit_critical_bh(&priv->br_ext_lock, &irqL);
return 0; return 0;
} }
@ -445,29 +420,24 @@ static void __nat25_db_network_insert(struct adapter *priv,
struct nat25_network_db_entry *db; struct nat25_network_db_entry *db;
int hash; int hash;
unsigned long irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL);
_enter_critical_bh(&priv->br_ext_lock, &irqL);
hash = __nat25_network_hash(networkAddr); hash = __nat25_network_hash(networkAddr);
db = priv->nethash[hash]; db = priv->nethash[hash];
while (db != NULL) while (db != NULL) {
{ if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) {
if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN))
{
memcpy(db->macAddr, macAddr, ETH_ALEN); memcpy(db->macAddr, macAddr, ETH_ALEN);
db->ageing_timer = jiffies; db->ageing_timer = jiffies;
_exit_critical_bh(&priv->br_ext_lock, &irqL); _exit_critical_bh(&priv->br_ext_lock, &irqL);
return; return;
} }
db = db->next_hash; db = db->next_hash;
} }
db = (struct nat25_network_db_entry *) rtw_malloc(sizeof(*db)); db = (struct nat25_network_db_entry *) rtw_malloc(sizeof(*db));
if (db == NULL) { if (db == NULL) {
_exit_critical_bh(&priv->br_ext_lock, &irqL); _exit_critical_bh(&priv->br_ext_lock, &irqL);
return; return;
} }
memcpy(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN); memcpy(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN);
memcpy(db->macAddr, macAddr, ETH_ALEN); memcpy(db->macAddr, macAddr, ETH_ALEN);
atomic_set(&db->use_count, 1); atomic_set(&db->use_count, 1);
@ -478,7 +448,6 @@ static void __nat25_db_network_insert(struct adapter *priv,
_exit_critical_bh(&priv->br_ext_lock, &irqL); _exit_critical_bh(&priv->br_ext_lock, &irqL);
} }
static void __nat25_db_print(struct adapter *priv) static void __nat25_db_print(struct adapter *priv)
{ {
} }
@ -493,46 +462,37 @@ void nat25_db_cleanup(struct adapter *priv)
unsigned long irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
for (i=0; i<NAT25_HASH_SIZE; i++) for (i = 0; i < NAT25_HASH_SIZE; i++) {
{
struct nat25_network_db_entry *f; struct nat25_network_db_entry *f;
f = priv->nethash[i]; f = priv->nethash[i];
while (f != NULL) { while (f != NULL) {
struct nat25_network_db_entry *g; struct nat25_network_db_entry *g;
g = f->next_hash; g = f->next_hash;
if (priv->scdb_entry == f) if (priv->scdb_entry == f) {
{
memset(priv->scdb_mac, 0, ETH_ALEN); memset(priv->scdb_mac, 0, ETH_ALEN);
memset(priv->scdb_ip, 0, 4); memset(priv->scdb_ip, 0, 4);
priv->scdb_entry = NULL; priv->scdb_entry = NULL;
} }
__network_hash_unlink(f); __network_hash_unlink(f);
rtw_mfree((u8 *) f, sizeof(struct nat25_network_db_entry)); rtw_mfree((u8 *) f, sizeof(struct nat25_network_db_entry));
f = g; f = g;
} }
} }
_exit_critical_bh(&priv->br_ext_lock, &irqL); _exit_critical_bh(&priv->br_ext_lock, &irqL);
} }
void nat25_db_expire(struct adapter *priv) void nat25_db_expire(struct adapter *priv)
{ {
int i; int i;
unsigned long irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
/* if (!priv->ethBrExtInfo.nat25_disable) */ for (i = 0; i < NAT25_HASH_SIZE; i++) {
{
for (i=0; i<NAT25_HASH_SIZE; i++)
{
struct nat25_network_db_entry *f; struct nat25_network_db_entry *f;
f = priv->nethash[i]; f = priv->nethash[i];
while (f != NULL) while (f != NULL) {
{
struct nat25_network_db_entry *g; struct nat25_network_db_entry *g;
g = f->next_hash; g = f->next_hash;
@ -550,8 +510,6 @@ void nat25_db_expire(struct adapter *priv)
f = g; f = g;
} }
} }
}
_exit_critical_bh(&priv->br_ext_lock, &irqL); _exit_critical_bh(&priv->br_ext_lock, &irqL);
} }
@ -572,23 +530,18 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Handle IP frame */ /* Handle IP frame */
/*---------------------------------------------------*/ /*---------------------------------------------------*/
if (protocol == ETH_P_IP) if (protocol == ETH_P_IP) {
{
struct iphdr *iph = (struct iphdr *)(skb->data + ETH_HLEN); struct iphdr *iph = (struct iphdr *)(skb->data + ETH_HLEN);
if (((unsigned char*)(iph) + (iph->ihl<<2)) >= (skb->data + ETH_HLEN + skb->len)) if (((unsigned char *)(iph) + (iph->ihl<<2)) >= (skb->data + ETH_HLEN + skb->len)) {
{
DEBUG_WARN("NAT25: malformed IP packet !\n"); DEBUG_WARN("NAT25: malformed IP packet !\n");
return -1; return -1;
} }
switch (method) switch (method) {
{
case NAT25_CHECK: case NAT25_CHECK:
return -1; return -1;
case NAT25_INSERT: case NAT25_INSERT:
{
/* some muticast with source IP is all zero, maybe other case is illegal */ /* some muticast with source IP is all zero, maybe other case is illegal */
/* in class A, B, C, host address is all zero or all one is illegal */ /* in class A, B, C, host address is all zero or all one is illegal */
if (iph->saddr == 0) if (iph->saddr == 0)
@ -600,11 +553,8 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
__nat25_db_print(priv); __nat25_db_print(priv);
}
return 0; return 0;
case NAT25_LOOKUP: case NAT25_LOOKUP:
{
DEBUG_INFO("NAT25: Lookup IP, SA =%08x, DA =%08x\n", iph->saddr, iph->daddr); DEBUG_INFO("NAT25: Lookup IP, SA =%08x, DA =%08x\n", iph->saddr, iph->daddr);
tmp = be32_to_cpu(iph->daddr); tmp = be32_to_cpu(iph->daddr);
__nat25_generate_ipv4_network_addr(networkAddr, &tmp); __nat25_generate_ipv4_network_addr(networkAddr, &tmp);
@ -614,8 +564,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
/* L2 is unicast but L3 is broadcast, make L2 bacome broadcast */ /* L2 is unicast but L3 is broadcast, make L2 bacome broadcast */
DEBUG_INFO("NAT25: Set DA as boardcast\n"); DEBUG_INFO("NAT25: Set DA as boardcast\n");
memset(skb->data, 0xff, ETH_ALEN); memset(skb->data, 0xff, ETH_ALEN);
} } else {
else {
/* forward unknow IP packet to upper TCP/IP */ /* forward unknow IP packet to upper TCP/IP */
DEBUG_INFO("NAT25: Replace DA with BR's MAC\n"); DEBUG_INFO("NAT25: Replace DA with BR's MAC\n");
if ((*(u32 *)priv->br_mac) == 0 && (*(u16 *)(priv->br_mac+4)) == 0) { if ((*(u32 *)priv->br_mac) == 0 && (*(u16 *)(priv->br_mac+4)) == 0) {
@ -625,175 +574,128 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
memcpy(skb->data, priv->br_mac, ETH_ALEN); memcpy(skb->data, priv->br_mac, ETH_ALEN);
} }
} }
}
return 0; return 0;
default: default:
return -1; return -1;
} }
} } else if (protocol == ETH_P_ARP) {
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Handle ARP frame */ /* Handle ARP frame */
/*---------------------------------------------------*/ /*---------------------------------------------------*/
else if (protocol == ETH_P_ARP)
{
struct arphdr *arp = (struct arphdr *)(skb->data + ETH_HLEN); struct arphdr *arp = (struct arphdr *)(skb->data + ETH_HLEN);
unsigned char *arp_ptr = (unsigned char *)(arp + 1); unsigned char *arp_ptr = (unsigned char *)(arp + 1);
unsigned int *sender, *target; unsigned int *sender, *target;
if (arp->ar_pro != __constant_htons(ETH_P_IP)) if (arp->ar_pro != __constant_htons(ETH_P_IP)) {
{
DEBUG_WARN("NAT25: arp protocol unknown (%4x)!\n", be16_to_cpu(arp->ar_pro)); DEBUG_WARN("NAT25: arp protocol unknown (%4x)!\n", be16_to_cpu(arp->ar_pro));
return -1; return -1;
} }
switch (method) switch (method) {
{
case NAT25_CHECK: case NAT25_CHECK:
return 0; /* skb_copy for all ARP frame */ return 0; /* skb_copy for all ARP frame */
case NAT25_INSERT: case NAT25_INSERT:
{
DEBUG_INFO("NAT25: Insert ARP, MAC =%02x%02x%02x%02x%02x%02x\n", arp_ptr[0], DEBUG_INFO("NAT25: Insert ARP, MAC =%02x%02x%02x%02x%02x%02x\n", arp_ptr[0],
arp_ptr[1], arp_ptr[2], arp_ptr[3], arp_ptr[4], arp_ptr[5]); arp_ptr[1], arp_ptr[2], arp_ptr[3], arp_ptr[4], arp_ptr[5]);
/* change to ARP sender mac address to wlan STA address */ /* change to ARP sender mac address to wlan STA address */
memcpy(arp_ptr, GET_MY_HWADDR(priv), ETH_ALEN); memcpy(arp_ptr, GET_MY_HWADDR(priv), ETH_ALEN);
arp_ptr += arp->ar_hln; arp_ptr += arp->ar_hln;
sender = (unsigned int *)arp_ptr; sender = (unsigned int *)arp_ptr;
__nat25_generate_ipv4_network_addr(networkAddr, sender); __nat25_generate_ipv4_network_addr(networkAddr, sender);
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
__nat25_db_print(priv); __nat25_db_print(priv);
}
return 0; return 0;
case NAT25_LOOKUP: case NAT25_LOOKUP:
{
DEBUG_INFO("NAT25: Lookup ARP\n"); DEBUG_INFO("NAT25: Lookup ARP\n");
arp_ptr += arp->ar_hln; arp_ptr += arp->ar_hln;
sender = (unsigned int *)arp_ptr; sender = (unsigned int *)arp_ptr;
arp_ptr += (arp->ar_hln + arp->ar_pln); arp_ptr += (arp->ar_hln + arp->ar_pln);
target = (unsigned int *)arp_ptr; target = (unsigned int *)arp_ptr;
__nat25_generate_ipv4_network_addr(networkAddr, target); __nat25_generate_ipv4_network_addr(networkAddr, target);
__nat25_db_network_lookup_and_replace(priv, skb, networkAddr); __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
/* change to ARP target mac address to Lookup result */ /* change to ARP target mac address to Lookup result */
arp_ptr = (unsigned char *)(arp + 1); arp_ptr = (unsigned char *)(arp + 1);
arp_ptr += (arp->ar_hln + arp->ar_pln); arp_ptr += (arp->ar_hln + arp->ar_pln);
memcpy(arp_ptr, skb->data, ETH_ALEN); memcpy(arp_ptr, skb->data, ETH_ALEN);
}
return 0; return 0;
default: default:
return -1; return -1;
} }
} } else if ((protocol == ETH_P_IPX) ||
(protocol <= ETH_FRAME_LEN)) {
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Handle IPX and Apple Talk frame */ /* Handle IPX and Apple Talk frame */
/*---------------------------------------------------*/ /*---------------------------------------------------*/
else if ((protocol == ETH_P_IPX) ||
(protocol <= ETH_FRAME_LEN))
{
unsigned char ipx_header[2] = {0xFF, 0xFF}; unsigned char ipx_header[2] = {0xFF, 0xFF};
struct ipxhdr *ipx = NULL; struct ipxhdr *ipx = NULL;
struct elapaarp *ea = NULL; struct elapaarp *ea = NULL;
struct ddpehdr *ddp = NULL; struct ddpehdr *ddp = NULL;
unsigned char *framePtr = skb->data + ETH_HLEN; unsigned char *framePtr = skb->data + ETH_HLEN;
if (protocol == ETH_P_IPX) if (protocol == ETH_P_IPX) {
{
DEBUG_INFO("NAT25: Protocol = IPX (Ethernet II)\n"); DEBUG_INFO("NAT25: Protocol = IPX (Ethernet II)\n");
ipx = (struct ipxhdr *)framePtr; ipx = (struct ipxhdr *)framePtr;
} } else if (protocol <= ETH_FRAME_LEN) {
else if (protocol <= ETH_FRAME_LEN) if (!memcmp(ipx_header, framePtr, 2)) {
{
if (!memcmp(ipx_header, framePtr, 2))
{
DEBUG_INFO("NAT25: Protocol = IPX (Ethernet 802.3)\n"); DEBUG_INFO("NAT25: Protocol = IPX (Ethernet 802.3)\n");
ipx = (struct ipxhdr *)framePtr; ipx = (struct ipxhdr *)framePtr;
} } else {
else
{
unsigned char ipx_8022_type = 0xE0; unsigned char ipx_8022_type = 0xE0;
unsigned char snap_8022_type = 0xAA; unsigned char snap_8022_type = 0xAA;
if (*framePtr == snap_8022_type) if (*framePtr == snap_8022_type) {
{
unsigned char ipx_snap_id[5] = {0x0, 0x0, 0x0, 0x81, 0x37}; /* IPX SNAP ID */ unsigned char ipx_snap_id[5] = {0x0, 0x0, 0x0, 0x81, 0x37}; /* IPX SNAP ID */
unsigned char aarp_snap_id[5] = {0x00, 0x00, 0x00, 0x80, 0xF3}; /* Apple Talk AARP SNAP ID */ unsigned char aarp_snap_id[5] = {0x00, 0x00, 0x00, 0x80, 0xF3}; /* Apple Talk AARP SNAP ID */
unsigned char ddp_snap_id[5] = {0x08, 0x00, 0x07, 0x80, 0x9B}; /* Apple Talk DDP SNAP ID */ unsigned char ddp_snap_id[5] = {0x08, 0x00, 0x07, 0x80, 0x9B}; /* Apple Talk DDP SNAP ID */
framePtr += 3; /* eliminate the 802.2 header */ framePtr += 3; /* eliminate the 802.2 header */
if (!memcmp(ipx_snap_id, framePtr, 5)) if (!memcmp(ipx_snap_id, framePtr, 5)) {
{
framePtr += 5; /* eliminate the SNAP header */ framePtr += 5; /* eliminate the SNAP header */
DEBUG_INFO("NAT25: Protocol = IPX (Ethernet SNAP)\n"); DEBUG_INFO("NAT25: Protocol = IPX (Ethernet SNAP)\n");
ipx = (struct ipxhdr *)framePtr; ipx = (struct ipxhdr *)framePtr;
} } else if (!memcmp(aarp_snap_id, framePtr, 5)) {
else if (!memcmp(aarp_snap_id, framePtr, 5))
{
framePtr += 5; /* eliminate the SNAP header */ framePtr += 5; /* eliminate the SNAP header */
ea = (struct elapaarp *)framePtr; ea = (struct elapaarp *)framePtr;
} } else if (!memcmp(ddp_snap_id, framePtr, 5)) {
else if (!memcmp(ddp_snap_id, framePtr, 5))
{
framePtr += 5; /* eliminate the SNAP header */ framePtr += 5; /* eliminate the SNAP header */
ddp = (struct ddpehdr *)framePtr; ddp = (struct ddpehdr *)framePtr;
} } else {
else
{
DEBUG_WARN("NAT25: Protocol = Ethernet SNAP %02x%02x%02x%02x%02x\n", framePtr[0], DEBUG_WARN("NAT25: Protocol = Ethernet SNAP %02x%02x%02x%02x%02x\n", framePtr[0],
framePtr[1], framePtr[2], framePtr[3], framePtr[4]); framePtr[1], framePtr[2], framePtr[3], framePtr[4]);
return -1; return -1;
} }
} } else if (*framePtr == ipx_8022_type) {
else if (*framePtr == ipx_8022_type)
{
framePtr += 3; /* eliminate the 802.2 header */ framePtr += 3; /* eliminate the 802.2 header */
if (!memcmp(ipx_header, framePtr, 2)) if (!memcmp(ipx_header, framePtr, 2)) {
{
DEBUG_INFO("NAT25: Protocol = IPX (Ethernet 802.2)\n"); DEBUG_INFO("NAT25: Protocol = IPX (Ethernet 802.2)\n");
ipx = (struct ipxhdr *)framePtr; ipx = (struct ipxhdr *)framePtr;
} } else {
else
return -1; return -1;
} }
else } else {
return -1; return -1;
} }
} }
else } else {
return -1; return -1;
}
/* IPX */ /* IPX */
if (ipx != NULL) if (ipx != NULL) {
{ switch (method) {
switch (method)
{
case NAT25_CHECK: case NAT25_CHECK:
if (!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) if (!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN))
{
DEBUG_INFO("NAT25: Check IPX skb_copy\n"); DEBUG_INFO("NAT25: Check IPX skb_copy\n");
return 0; return 0;
}
return -1; return -1;
case NAT25_INSERT: case NAT25_INSERT:
{
DEBUG_INFO("NAT25: Insert IPX, Dest =%08x,%02x%02x%02x%02x%02x%02x,%04x Source =%08x,%02x%02x%02x%02x%02x%02x,%04x\n", DEBUG_INFO("NAT25: Insert IPX, Dest =%08x,%02x%02x%02x%02x%02x%02x,%04x Source =%08x,%02x%02x%02x%02x%02x%02x,%04x\n",
ipx->ipx_dest.net, ipx->ipx_dest.net,
ipx->ipx_dest.node[0], ipx->ipx_dest.node[0],
@ -812,30 +714,21 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
ipx->ipx_source.node[5], ipx->ipx_source.node[5],
ipx->ipx_source.sock); ipx->ipx_source.sock);
if (!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) if (!memcmp(skb->data+ETH_ALEN, ipx->ipx_source.node, ETH_ALEN)) {
{
DEBUG_INFO("NAT25: Use IPX Net, and Socket as network addr\n"); DEBUG_INFO("NAT25: Use IPX Net, and Socket as network addr\n");
__nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_source.net, &ipx->ipx_source.sock); __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_source.net, &ipx->ipx_source.sock);
/* change IPX source node addr to wlan STA address */ /* change IPX source node addr to wlan STA address */
memcpy(ipx->ipx_source.node, GET_MY_HWADDR(priv), ETH_ALEN); memcpy(ipx->ipx_source.node, GET_MY_HWADDR(priv), ETH_ALEN);
} } else {
else
{
__nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node); __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node);
} }
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
__nat25_db_print(priv); __nat25_db_print(priv);
}
return 0; return 0;
case NAT25_LOOKUP: case NAT25_LOOKUP:
{ if (!memcmp(GET_MY_HWADDR(priv), ipx->ipx_dest.node, ETH_ALEN)) {
if (!memcmp(GET_MY_HWADDR(priv), ipx->ipx_dest.node, ETH_ALEN))
{
DEBUG_INFO("NAT25: Lookup IPX, Modify Destination IPX Node addr\n"); DEBUG_INFO("NAT25: Lookup IPX, Modify Destination IPX Node addr\n");
__nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_dest.net, &ipx->ipx_dest.sock); __nat25_generate_ipx_network_addr_with_socket(networkAddr, &ipx->ipx_dest.net, &ipx->ipx_dest.sock);
@ -844,38 +737,26 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
/* replace IPX destination node addr with Lookup destination MAC addr */ /* replace IPX destination node addr with Lookup destination MAC addr */
memcpy(ipx->ipx_dest.node, skb->data, ETH_ALEN); memcpy(ipx->ipx_dest.node, skb->data, ETH_ALEN);
} } else {
else
{
__nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_dest.net, ipx->ipx_dest.node); __nat25_generate_ipx_network_addr_with_node(networkAddr, &ipx->ipx_dest.net, ipx->ipx_dest.node);
__nat25_db_network_lookup_and_replace(priv, skb, networkAddr); __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
} }
}
return 0; return 0;
default: default:
return -1; return -1;
} }
} } else if (ea != NULL) {
/* AARP */
else if (ea != NULL)
{
/* Sanity check fields. */ /* Sanity check fields. */
if (ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) if (ea->hw_len != ETH_ALEN || ea->pa_len != AARP_PA_ALEN) {
{
DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n"); DEBUG_WARN("NAT25: Appletalk AARP Sanity check fail!\n");
return -1; return -1;
} }
switch (method) switch (method) {
{
case NAT25_CHECK: case NAT25_CHECK:
return 0; return 0;
case NAT25_INSERT: case NAT25_INSERT:
{
/* change to AARP source mac address to wlan STA address */ /* change to AARP source mac address to wlan STA address */
memcpy(ea->hw_src, GET_MY_HWADDR(priv), ETH_ALEN); memcpy(ea->hw_src, GET_MY_HWADDR(priv), ETH_ALEN);
@ -890,11 +771,8 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
__nat25_db_print(priv); __nat25_db_print(priv);
}
return 0; return 0;
case NAT25_LOOKUP: case NAT25_LOOKUP:
{
DEBUG_INFO("NAT25: Lookup AARP, Source =%d,%d Destination =%d,%d\n", DEBUG_INFO("NAT25: Lookup AARP, Source =%d,%d Destination =%d,%d\n",
ea->pa_src_net, ea->pa_src_net,
ea->pa_src_node, ea->pa_src_node,
@ -907,24 +785,15 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
/* change to AARP destination mac address to Lookup result */ /* change to AARP destination mac address to Lookup result */
memcpy(ea->hw_dst, skb->data, ETH_ALEN); memcpy(ea->hw_dst, skb->data, ETH_ALEN);
}
return 0; return 0;
default: default:
return -1; return -1;
} }
} } else if (ddp != NULL) {
switch (method) {
/* DDP */
else if (ddp != NULL)
{
switch (method)
{
case NAT25_CHECK: case NAT25_CHECK:
return -1; return -1;
case NAT25_INSERT: case NAT25_INSERT:
{
DEBUG_INFO("NAT25: Insert DDP, Source =%d,%d Destination =%d,%d\n", DEBUG_INFO("NAT25: Insert DDP, Source =%d,%d Destination =%d,%d\n",
ddp->deh_snet, ddp->deh_snet,
ddp->deh_snode, ddp->deh_snode,
@ -936,52 +805,38 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
__nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr); __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
__nat25_db_print(priv); __nat25_db_print(priv);
}
return 0; return 0;
case NAT25_LOOKUP: case NAT25_LOOKUP:
{
DEBUG_INFO("NAT25: Lookup DDP, Source =%d,%d Destination =%d,%d\n", DEBUG_INFO("NAT25: Lookup DDP, Source =%d,%d Destination =%d,%d\n",
ddp->deh_snet, ddp->deh_snet,
ddp->deh_snode, ddp->deh_snode,
ddp->deh_dnet, ddp->deh_dnet,
ddp->deh_dnode); ddp->deh_dnode);
__nat25_generate_apple_network_addr(networkAddr, &ddp->deh_dnet, &ddp->deh_dnode); __nat25_generate_apple_network_addr(networkAddr, &ddp->deh_dnet, &ddp->deh_dnode);
__nat25_db_network_lookup_and_replace(priv, skb, networkAddr); __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
}
return 0; return 0;
default: default:
return -1; return -1;
} }
} }
return -1; return -1;
} } else if ((protocol == ETH_P_PPP_DISC) ||
(protocol == ETH_P_PPP_SES)) {
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Handle PPPoE frame */ /* Handle PPPoE frame */
/*---------------------------------------------------*/ /*---------------------------------------------------*/
else if ((protocol == ETH_P_PPP_DISC) ||
(protocol == ETH_P_PPP_SES))
{
struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN); struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN);
unsigned short *pMagic; unsigned short *pMagic;
switch (method) switch (method) {
{
case NAT25_CHECK: case NAT25_CHECK:
if (ph->sid == 0) if (ph->sid == 0)
return 0; return 0;
return 1; return 1;
case NAT25_INSERT: case NAT25_INSERT:
if (ph->sid == 0) /* Discovery phase according to tag */ if (ph->sid == 0) { /* Discovery phase according to tag */
{ if (ph->code == PADI_CODE || ph->code == PADR_CODE) {
if (ph->code == PADI_CODE || ph->code == PADR_CODE)
{
if (priv->ethBrExtInfo.addPPPoETag) { if (priv->ethBrExtInfo.addPPPoETag) {
struct pppoe_tag *tag, *pOldTag; struct pppoe_tag *tag, *pOldTag;
unsigned char tag_buf[40]; unsigned char tag_buf[40];
@ -1020,8 +875,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
DEBUG_INFO("NAT25: Insert PPPoE, forward %s packet\n", DEBUG_INFO("NAT25: Insert PPPoE, forward %s packet\n",
(ph->code == PADI_CODE ? "PADI" : "PADR")); (ph->code == PADI_CODE ? "PADI" : "PADR"));
} } else { /* not add relay tag */
else { /* not add relay tag */
if (priv->pppoe_connection_in_progress && if (priv->pppoe_connection_in_progress &&
memcmp(skb->data+ETH_ALEN, priv->pppoe_addr, ETH_ALEN)) { memcmp(skb->data+ETH_ALEN, priv->pppoe_addr, ETH_ALEN)) {
DEBUG_ERR("Discard PPPoE packet due to another PPPoE connection is in progress!\n"); DEBUG_ERR("Discard PPPoE packet due to another PPPoE connection is in progress!\n");
@ -1033,12 +887,10 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
priv->pppoe_connection_in_progress = WAIT_TIME_PPPOE; priv->pppoe_connection_in_progress = WAIT_TIME_PPPOE;
} }
} } else {
else
return -1; return -1;
} }
else /* session phase */ } else { /* session phase */
{
DEBUG_INFO("NAT25: Insert PPPoE, insert session packet to %s\n", skb->dev->name); DEBUG_INFO("NAT25: Insert PPPoE, insert session packet to %s\n", skb->dev->name);
__nat25_generate_pppoe_network_addr(networkAddr, skb->data, &(ph->sid)); __nat25_generate_pppoe_network_addr(networkAddr, skb->data, &(ph->sid));
@ -1053,17 +905,16 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
priv->pppoe_connection_in_progress = 0; priv->pppoe_connection_in_progress = 0;
} }
return 0; return 0;
case NAT25_LOOKUP: case NAT25_LOOKUP:
if (ph->code == PADO_CODE || ph->code == PADS_CODE) if (ph->code == PADO_CODE || ph->code == PADS_CODE) {
{
if (priv->ethBrExtInfo.addPPPoETag) { if (priv->ethBrExtInfo.addPPPoETag) {
struct pppoe_tag *tag; struct pppoe_tag *tag;
unsigned char *ptr; unsigned char *ptr;
unsigned short tagType, tagLen; unsigned short tagType, tagLen;
int offset = 0; int offset = 0;
if ((ptr = __nat25_find_pppoe_tag(ph, ntohs(PTT_RELAY_SID))) == NULL) { ptr = __nat25_find_pppoe_tag(ph, ntohs(PTT_RELAY_SID));
if (ptr == NULL) {
DEBUG_ERR("Fail to find PTT_RELAY_SID in FADO!\n"); DEBUG_ERR("Fail to find PTT_RELAY_SID in FADO!\n");
return -1; return -1;
} }
@ -1099,8 +950,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
DEBUG_INFO("NAT25: Lookup PPPoE, forward %s Packet from %s\n", DEBUG_INFO("NAT25: Lookup PPPoE, forward %s Packet from %s\n",
(ph->code == PADO_CODE ? "PADO" : "PADS"), skb->dev->name); (ph->code == PADO_CODE ? "PADO" : "PADS"), skb->dev->name);
} } else { /* not add relay tag */
else { /* not add relay tag */
if (!priv->pppoe_connection_in_progress) { if (!priv->pppoe_connection_in_progress) {
DEBUG_ERR("Discard PPPoE packet due to no connection in progresss!\n"); DEBUG_ERR("Discard PPPoE packet due to no connection in progresss!\n");
return -1; return -1;
@ -1108,93 +958,65 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
memcpy(skb->data, priv->pppoe_addr, ETH_ALEN); memcpy(skb->data, priv->pppoe_addr, ETH_ALEN);
priv->pppoe_connection_in_progress = WAIT_TIME_PPPOE; priv->pppoe_connection_in_progress = WAIT_TIME_PPPOE;
} }
} } else {
else { if (ph->sid != 0) {
if (ph->sid != 0)
{
DEBUG_INFO("NAT25: Lookup PPPoE, lookup session packet from %s\n", skb->dev->name); DEBUG_INFO("NAT25: Lookup PPPoE, lookup session packet from %s\n", skb->dev->name);
__nat25_generate_pppoe_network_addr(networkAddr, skb->data+ETH_ALEN, &(ph->sid)); __nat25_generate_pppoe_network_addr(networkAddr, skb->data+ETH_ALEN, &(ph->sid));
__nat25_db_network_lookup_and_replace(priv, skb, networkAddr); __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
__nat25_db_print(priv); __nat25_db_print(priv);
} } else {
else
return -1; return -1;
}
} }
return 0; return 0;
default: default:
return -1; return -1;
} }
} } else if (protocol == 0x888e) {
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Handle EAP frame */ /* Handle EAP frame */
/*---------------------------------------------------*/ /*---------------------------------------------------*/
else if (protocol == 0x888e) switch (method) {
{
switch (method)
{
case NAT25_CHECK: case NAT25_CHECK:
return -1; return -1;
case NAT25_INSERT: case NAT25_INSERT:
return 0; return 0;
case NAT25_LOOKUP: case NAT25_LOOKUP:
return 0; return 0;
default: default:
return -1; return -1;
} }
} } else if ((protocol == 0xe2ae) || (protocol == 0xe2af)) {
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Handle C-Media proprietary frame */ /* Handle C-Media proprietary frame */
/*---------------------------------------------------*/ /*---------------------------------------------------*/
else if ((protocol == 0xe2ae) || switch (method) {
(protocol == 0xe2af))
{
switch (method)
{
case NAT25_CHECK: case NAT25_CHECK:
return -1; return -1;
case NAT25_INSERT: case NAT25_INSERT:
return 0; return 0;
case NAT25_LOOKUP: case NAT25_LOOKUP:
return 0; return 0;
default: default:
return -1; return -1;
} }
} } else if (protocol == ETH_P_IPV6) {
/*------------------------------------------------*/
/*---------------------------------------------------*/
/* Handle IPV6 frame */ /* Handle IPV6 frame */
/*---------------------------------------------------*/ /*------------------------------------------------*/
else if (protocol == ETH_P_IPV6)
{
struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + ETH_HLEN); struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + ETH_HLEN);
if (sizeof(*iph) >= (skb->len - ETH_HLEN)) if (sizeof(*iph) >= (skb->len - ETH_HLEN)) {
{
DEBUG_WARN("NAT25: malformed IPv6 packet !\n"); DEBUG_WARN("NAT25: malformed IPv6 packet !\n");
return -1; return -1;
} }
switch (method) switch (method) {
{
case NAT25_CHECK: case NAT25_CHECK:
if (skb->data[0] & 1) if (skb->data[0] & 1)
return 0; return 0;
return -1; return -1;
case NAT25_INSERT: case NAT25_INSERT:
{
DEBUG_INFO("NAT25: Insert IP, SA =%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x," DEBUG_INFO("NAT25: Insert IP, SA =%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x,"
" DA =%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n", " DA =%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n",
iph->saddr.s6_addr16[0], iph->saddr.s6_addr16[1], iph->saddr.s6_addr16[2], iph->saddr.s6_addr16[3], iph->saddr.s6_addr16[0], iph->saddr.s6_addr16[1], iph->saddr.s6_addr16[2], iph->saddr.s6_addr16[3],
@ -1220,22 +1042,16 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
} }
} }
} }
}
return 0; return 0;
case NAT25_LOOKUP: case NAT25_LOOKUP:
DEBUG_INFO("NAT25: Lookup IP, SA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x," DEBUG_INFO("NAT25: Lookup IP, SA =%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x, DA =%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n",
" DA=%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n",
iph->saddr.s6_addr16[0], iph->saddr.s6_addr16[1], iph->saddr.s6_addr16[2], iph->saddr.s6_addr16[3], iph->saddr.s6_addr16[0], iph->saddr.s6_addr16[1], iph->saddr.s6_addr16[2], iph->saddr.s6_addr16[3],
iph->saddr.s6_addr16[4], iph->saddr.s6_addr16[5], iph->saddr.s6_addr16[6], iph->saddr.s6_addr16[7], iph->saddr.s6_addr16[4], iph->saddr.s6_addr16[5], iph->saddr.s6_addr16[6], iph->saddr.s6_addr16[7],
iph->daddr.s6_addr16[0], iph->daddr.s6_addr16[1], iph->daddr.s6_addr16[2], iph->daddr.s6_addr16[3], iph->daddr.s6_addr16[0], iph->daddr.s6_addr16[1], iph->daddr.s6_addr16[2], iph->daddr.s6_addr16[3],
iph->daddr.s6_addr16[4], iph->daddr.s6_addr16[5], iph->daddr.s6_addr16[6], iph->daddr.s6_addr16[7]); iph->daddr.s6_addr16[4], iph->daddr.s6_addr16[5], iph->daddr.s6_addr16[6], iph->daddr.s6_addr16[7]);
__nat25_generate_ipv6_network_addr(networkAddr, (unsigned int *)&iph->daddr); __nat25_generate_ipv6_network_addr(networkAddr, (unsigned int *)&iph->daddr);
__nat25_db_network_lookup_and_replace(priv, skb, networkAddr); __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
return 0; return 0;
default: default:
return -1; return -1;
} }
@ -1259,8 +1075,7 @@ int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb)
skb_pull(skb, 4); skb_pull(skb, 4);
} }
if (!priv->ethBrExtInfo.nat25_disable) if (!priv->ethBrExtInfo.nat25_disable) {
{
unsigned long irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
/* /*
@ -1335,16 +1150,13 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb)
if (skb == NULL) if (skb == NULL)
return; return;
if (!priv->ethBrExtInfo.dhcp_bcst_disable) if (!priv->ethBrExtInfo.dhcp_bcst_disable) {
{
__be16 protocol = *((__be16 *)(skb->data + 2 * ETH_ALEN)); __be16 protocol = *((__be16 *)(skb->data + 2 * ETH_ALEN));
if (protocol == __constant_htons(ETH_P_IP)) /* IP */ if (protocol == __constant_htons(ETH_P_IP)) { /* IP */
{
struct iphdr *iph = (struct iphdr *)(skb->data + ETH_HLEN); struct iphdr *iph = (struct iphdr *)(skb->data + ETH_HLEN);
if (iph->protocol == IPPROTO_UDP) /* UDP */ if (iph->protocol == IPPROTO_UDP) { /* UDP */
{
struct udphdr *udph = (struct udphdr *)((size_t)iph + (iph->ihl << 2)); struct udphdr *udph = (struct udphdr *)((size_t)iph + (iph->ihl << 2));
if ((udph->source == __constant_htons(CLIENT_PORT)) && if ((udph->source == __constant_htons(CLIENT_PORT)) &&
@ -1354,8 +1166,8 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb)
u32 cookie = be32_to_cpu((__be32)dhcph->cookie); u32 cookie = be32_to_cpu((__be32)dhcph->cookie);
if (cookie == DHCP_MAGIC) { /* match magic word */ if (cookie == DHCP_MAGIC) { /* match magic word */
if (!(dhcph->flags & htons(BROADCAST_FLAG))) /* if not broadcast */ if (!(dhcph->flags & htons(BROADCAST_FLAG))) {
{ /* if not broadcast */
register int sum = 0; register int sum = 0;
DEBUG_INFO("DHCP: change flag of DHCP request to broadcast.\n"); DEBUG_INFO("DHCP: change flag of DHCP request to broadcast.\n");
@ -1388,8 +1200,7 @@ void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,
__nat25_generate_ipv4_network_addr(networkAddr, (unsigned int *)ipAddr); __nat25_generate_ipv4_network_addr(networkAddr, (unsigned int *)ipAddr);
hash = __nat25_network_hash(networkAddr); hash = __nat25_network_hash(networkAddr);
db = priv->nethash[hash]; db = priv->nethash[hash];
while (db != NULL) while (db != NULL) {
{
if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) { if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) {
/* _exit_critical_bh(&priv->br_ext_lock, &irqL); */ /* _exit_critical_bh(&priv->br_ext_lock, &irqL); */
return (void *)db; return (void *)db;