PERFORCE change 166277 for review

[Fang Wang]

http://perforce.freebsd.org/chv.cgi?CH=166277

Change 166277 by fangwang at fangwang_utobsd on 2009/07/19 17:35:11

	Fix bug.

Affected files ...

.. //depot/projects/soc2009/tcputo/src/contrib/tcpdump/print-tcp.c#3 edit
.. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_usrreq.c#7 edit

Differences ...

==== //depot/projects/soc2009/tcputo/src/contrib/tcpdump/print-tcp.c#3 (text+ko) ====

@@ -618,10 +618,11 @@
                                 datalen = 2;
                                 LENCHECK(datalen);
                                 uint utoval = EXTRACT_16BITS(cp);
-                                if (utoval & (~(uint)0 - 1))
-                                        utoval = utoval >> 1;
+                                (void)printf("0x%x", utoval);
+                                if (utoval & 0x0001)
+                                        utoval = (utoval >> 1) * 60;
                                 else
-                                        utoval = (utoval >> 1) * 60;
+                                        utoval >>= 1;
                                 (void)printf(" %u", utoval);
                                 break;
 

==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_usrreq.c#7 (text+ko) ====

@@ -1382,8 +1382,8 @@
 				tp->uto_flags |= TCPUTO_ENABLE;
 			if (tu.flags & STORE_UTO) {
 				tp->uto_flags |= TCPUTO_NEED;
-				if (tu.uto > 0 && tu.uto <= 0x8FFF * 60) {
-					if (tu.uto > 0x8FFF) {
+				if (tu.uto > 0 && tu.uto <= 0x7FFF * 60) {
+					if (tu.uto > 0x7FFF) {
 						tp->snd_uto = tu.uto / 60;
 						tp->snd_uto <<= 1;
 						tp->snd_uto |= 1;