Diff: tcp/tcpsend.c

Revision:

156:be12b8fd5b21

Parent:

155:22f249751106

Child:

157:b0bdb77e27f3

--- a/tcp/tcpsend.c	Tue Aug 20 14:49:00 2019 +0000
+++ b/tcp/tcpsend.c	Wed Aug 28 07:11:58 2019 +0000
@@ -44,15 +44,15 @@
     }    
 }
 
-static bool addAppData(int *pDataLength, void* pPacket, uint16_t port, uint32_t start, int mss, char* pAppState, char* pTlsState, bool clientFinished)
+static bool addAppData(int *pDataLength, void* pPacket, int connection, uint16_t port, uint32_t start, int mss, bool clientFinished)
 {
     uint8_t* pData = (uint8_t*)pPacket + TcpHdrSizeGet();
     TcpBufStart(start, mss, pData);
     bool finished = false;
     switch (port)
     {
-        case  80: finished = HttpShimPoll(clientFinished, pAppState, pTlsState, false); break;
-        case 443: finished = HttpShimPoll(clientFinished, pAppState, pTlsState, true ); break;
+        case  80: finished = HttpShimPoll(connection, clientFinished, false); break;
+        case 443: finished = HttpShimPoll(connection, clientFinished, true ); break;
     }
     *pDataLength = TcpBufLength();
     return finished;
@@ -97,7 +97,7 @@
             {
                 if (pTcb->bytesSentToRem - pTcb->bytesAckdByRem < pTcb->window)
                 {
-                    bool finished = addAppData(&dataLength, pPacket, pTcb->locPort, pTcb->bytesSentToRem - 1, pTcb->remMss, pTcb->appData, pTcb->tlsData, pTcb->rcvdFin);
+                    bool finished = addAppData(&dataLength, pPacket, TcbGetId(pTcb), pTcb->locPort, pTcb->bytesSentToRem - 1, pTcb->remMss, pTcb->rcvdFin);
                     if (finished)
                     {
                         TcpHdrFIN     = true;
@@ -146,7 +146,7 @@
         case TCB_ESTABLISHED:
         case TCB_CLOSE_FIN_WAIT:
             {
-                bool finished = addAppData(&dataLength, pPacket, pTcb->locPort, seqNum - 1, pTcb->remMss, pTcb->appData, pTcb->tlsData, pTcb->rcvdFin);
+                bool finished = addAppData(&dataLength, pPacket, TcbGetId(pTcb), pTcb->locPort, seqNum - 1, pTcb->remMss, pTcb->rcvdFin);
                 if (finished)
                 {
                     TcpHdrFIN     = true;