- Uncomment some SYN handling code
authorCameron Gutman <aicommander@gmail.com>
Wed, 30 Sep 2009 03:44:44 +0000 (03:44 +0000)
committerCameron Gutman <aicommander@gmail.com>
Wed, 30 Sep 2009 03:44:44 +0000 (03:44 +0000)
 - Enable a ROS-specific hack because oskittcp doesn't know about all interfaces in the system
 - Small cleanup of code

svn path=/trunk/; revision=43230

reactos/lib/drivers/oskittcp/oskittcp/ip_output.c
reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c

index b390a8c..13d5cc3 100644 (file)
@@ -301,7 +301,7 @@ ip_output(m0, opt, ro, flags, imo)
        }
 #endif
 
        }
 #endif
 
-#ifdef notdef
+#ifdef __REACTOS__
        /*
         * If source address not specified yet, use address
         * of outgoing interface.
        /*
         * If source address not specified yet, use address
         * of outgoing interface.
index 5f51c92..422306b 100644 (file)
@@ -86,9 +86,6 @@ tcp_output(tp)
        int idle, sendalot;
        struct rmxp_tao *taop;
        struct rmxp_tao tao_noncached;
        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"));
 
 
        OS_DbgPrint(OSK_MID_TRACE,("Called\n"));
 
@@ -411,7 +408,6 @@ send:
                 * CC or CC.new.
                 */
                case TH_SYN:
                 * CC or CC.new.
                 */
                case TH_SYN:
-#if 0
                        opt[optlen++] = TCPOPT_NOP;
                        opt[optlen++] = TCPOPT_NOP;
                        opt[optlen++] = tp->t_flags & TF_SENDCCNEW ?
                        opt[optlen++] = TCPOPT_NOP;
                        opt[optlen++] = TCPOPT_NOP;
                        opt[optlen++] = tp->t_flags & TF_SENDCCNEW ?
@@ -419,7 +415,6 @@ send:
                        opt[optlen++] = TCPOLEN_CC;
                        *(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
                        optlen += 4;
                        opt[optlen++] = TCPOLEN_CC;
                        *(u_int32_t *)&opt[optlen] = htonl(tp->cc_send);
                        optlen += 4;
-#endif
                        break;
 
                /*
                        break;
 
                /*
@@ -742,8 +737,7 @@ send:
            data block */
        while (NULL != m) {
            m->m_flags &= ~M_EXT;
            data block */
        while (NULL != m) {
            m->m_flags &= ~M_EXT;
-           MFREE(m, n);
-           m = n;
+           m = m_free(m);
        }
 #endif
     }
        }
 #endif
     }