patch-1.3.42 linux/net/ipv4/ip_options.c

• Lines: 29
• Date: Tue Nov 14 16:03:58 1995
• Orig file: v1.3.41/linux/net/ipv4/ip_options.c
• Orig date: Wed Nov 8 07:11:45 1995

diff -u --recursive --new-file v1.3.41/linux/net/ipv4/ip_options.c linux/net/ipv4/ip_options.c
@@ -118,14 +118,14 @@
 		memcpy(dptr, sptr+sopt->ts, optlen);
 		if (soffset <= optlen) 
 		{
-			if (dopt->ts_needaddr) 
+			if (sopt->ts_needaddr) 
 			{
 				if (soffset + 3 > optlen)
 					return -EINVAL;
 				dopt->ts_needaddr = 1;
 				soffset += 4;
 			}
-			if (dopt->ts_needtime) 
+			if (sopt->ts_needtime) 
 			{
 				if (soffset + 3 > optlen)
 					return -EINVAL;
@@ -376,10 +376,8 @@
 				      case IPOPT_TS_TSONLY:
 					opt->ts = optptr - iph;
 					if (skb) 
-					{
 						timeptr = (__u32*)&optptr[ts->ptr-1];
-						opt->is_changed = 1;
-					}
+					opt->ts_needtime = 1;
 					ts->ptr += 4;
 					break;
 				      case IPOPT_TS_TSANDADDR: