Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Sat May 26 21:53:10 CEST 2007
Subject: [cvs-checkins] MODIFIED: mlite ...
Date: 00/07/05 26:21:53

Modified: mlite/kernel tcpip.c
Log:
Made timeout adjustable


Revision Changes Path
1.11 mlite/kernel/tcpip.c

http://www.opencores.org/cvsweb.shtml/mlite/kernel/tcpip.c.diff?r1=1.10&r2=1.11

(In the diff below, changes in quantity of whitespace are not shown.)

Index: tcpip.c
===================================================================
RCS file: /cvsroot/rhoads/mlite/kernel/tcpip.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tcpip.c 21 May 2007 02:50:19 -0000 1.10
+++ tcpip.c 26 May 2007 19:53:10 -0000 1.11
@@ -771,7 +771,7 @@
{
//Remove packet from retransmition queue
if(socket->timeout)
- socket->timeout = SOCKET_TIMEOUT;
+ socket->timeout = socket->timeoutReset;
FrameRemove(&FrameResendHead, &FrameResendTail, framePrev);
FrameFree(framePrev);
}
@@ -811,11 +811,11 @@
{
//Insert packet into socket linked list
if(socket->timeout)
- socket->timeout = SOCKET_TIMEOUT;
+ socket->timeout = socket->timeoutReset;
if(IPVerbose)
printf("D");
if(frameIn->length > ip_length + IP_VERSION_LENGTH)
- frameIn->length = ip_length + IP_VERSION_LENGTH;
+ frameIn->length = (uint16)(ip_length + IP_VERSION_LENGTH);
FrameInsert(&socket->frameReadHead, &socket->frameReadTail, frameIn);
socket->ack += bytes;

@@ -861,7 +861,7 @@
TCPSendPacket(socket, frameOut, TCP_DATA);
if(socket->state == IP_FIN_SERVER)
IPClose2(socket);
- else
+ else if(socket->state == IP_TCP)
socket->state = IP_FIN_CLIENT;
}

@@ -870,7 +870,7 @@
{
if(socket->state == IP_FIN_SERVER)
IPClose2(socket);
- else
+ else if(socket->state == IP_TCP)
socket->state = IP_FIN_CLIENT;
}

@@ -1138,6 +1138,7 @@
socket->prev = NULL;
socket->state = IP_LISTEN;
socket->timeout = 0;
+ socket->timeoutReset = SOCKET_TIMEOUT;
socket->frameReadHead = NULL;
socket->frameReadTail = NULL;
socket->readOffset = 0;
@@ -1272,6 +1273,9 @@
int offset;
OS_Thread_t *self;

+ if(socket->timeout)
+ socket->timeout = socket->timeoutReset;
+
//printf("IPWrite(0x%x, %d)", Socket, Length);
self = OS_ThreadSelf();
while(length)
@@ -1449,7 +1453,7 @@
return;
}
frameOut = IPFrameGet(0);
- if(frameOut == 0)
+ if(frameOut == NULL)
return;
frameOut->packet[TCP_FLAGS] = TCP_FLAGS_FIN | TCP_FLAGS_ACK;
TCPSendPacket(socket, frameOut, TCP_DATA);