patch-1.3.65 linux/net/ipv4/ip_fw.c

• Lines: 56
• Date: Sat Feb 17 08:11:12 1996
• Orig file: v1.3.64/linux/net/ipv4/ip_fw.c
• Orig date: Fri Feb 9 17:53:11 1996

diff -u --recursive --new-file v1.3.64/linux/net/ipv4/ip_fw.c linux/net/ipv4/ip_fw.c
@@ -487,9 +487,11 @@
 		tosxor=f->fw_tosxor;
 	}
 	else
+	{
 		tosand=0xFF;
 		tosxor=0x00;
-
+	}
+	
 	if(opt != 1) 
 	{
 		if(policy&IP_FW_F_ACCEPT)
@@ -895,7 +897,7 @@
  		}
  		else ms->timer.expires = jiffies+MASQUERADE_EXPIRE_TCP;
  
- 		tcp_send_check(th,iph->saddr,iph->daddr,size,skb->sk);
+ 		tcp_send_check(th,iph->saddr,iph->daddr,size,skb);
  	}
  	add_timer(&ms->timer);
  	ip_send_check(iph);
@@ -914,12 +916,12 @@
   *	this function.
   */
 
-int ip_fw_demasquerade(struct sk_buff *skb_ptr)
+int ip_fw_demasquerade(struct sk_buff *skb)
 {
- 	struct iphdr	*iph = skb_ptr->h.iph;
+ 	struct iphdr	*iph = skb->h.iph;
  	unsigned short	*portptr;
  	struct ip_masq	*ms;
- 	struct tcphdr   *th = (struct tcphdr *)(skb_ptr->h.raw+(iph->ihl<<2));
+ 	struct tcphdr   *th = (struct tcphdr *)(skb->h.raw+(iph->ihl<<2));
  
  	if (iph->protocol!=IPPROTO_UDP && iph->protocol!=IPPROTO_TCP)
  		return 0;
@@ -954,7 +956,7 @@
  		    portptr[1]==ms->mport)
  		{
  		
- 			int size = skb_ptr->len - ((unsigned char *)portptr - skb_ptr->h.raw);
+ 			int size = skb->len - ((unsigned char *)portptr - skb->h.raw);
  			iph->daddr = ms->src;
  			portptr[1] = ms->sport;
  			
@@ -1000,7 +1002,7 @@
 #endif
 					}
 				}
- 				tcp_send_check((struct tcphdr *)portptr,iph->saddr,iph->daddr,size,skb_ptr->sk);
+ 				tcp_send_check((struct tcphdr *)portptr,iph->saddr,iph->daddr,size,skb);
  			}
  			ip_send_check(iph);
 #ifdef DEBUG_MASQ