[ros-diffs] [cgutman] 43230: - Uncomment some SYN handling code - Enable a ROS-specific hack because oskittcp doesn't know about all interfaces in the system - Small cleanup of code

[cgutman at svn.reactos.org]

Author: cgutman
Date: Wed Sep 30 05:44:44 2009
New Revision: 43230

URL: http://svn.reactos.org/svn/reactos?rev=43230&view=rev
Log:
 - Uncomment some SYN handling code
 - Enable a ROS-specific hack because oskittcp doesn't know about all interfaces in the system
 - Small cleanup of code

Modified:
    trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c
    trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c

Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c?rev=43230&r1=43229&r2=43230&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Wed Sep 30 05:44:44 2009
@@ -301,7 +301,7 @@
 	}
 #endif
 
-#ifdef notdef
+#ifdef __REACTOS__
 	/*
 	 * If source address not specified yet, use address
 	 * of outgoing interface.

Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c?rev=43230&r1=43229&r2=43230&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c [iso-8859-1] Wed Sep 30 05:44:44 2009
@@ -86,9 +86,6 @@
 	int idle, sendalot;
 	struct rmxp_tao *taop;
 	struct rmxp_tao tao_noncached;
-#ifdef __REACTOS__
-	struct mbuf *n;
-#endif
 
 	OS_DbgPrint(OSK_MID_TRACE,("Called\n"));
 
@@ -411,7 +408,6 @@
 		 * CC or CC.new.
 		 */
 		case TH_SYN:
-#if 0
 			opt[optlen++] = TCPOPT_NOP;
 			opt[optlen++] = TCPOPT_NOP;
 			opt[optlen++] = tp->t_flags & TF_SENDCCNEW ?
@@ -419,7 +415,6 @@
 			opt[optlen++] = TCPOLEN_CC;
 			*(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
  			optlen += 4;
-#endif
 			break;
 
 		/*
@@ -742,8 +737,7 @@
            data block */
 	while (NULL != m) {
 	    m->m_flags &= ~M_EXT;
-	    MFREE(m, n);
-	    m = n;
+	    m = m_free(m);
 	}
 #endif
     }