Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[lwIP]

Browse source 
- Remove foreign identifier field from the tcp_pcb structure. This was added for some debugging purposes sometime ago but now it's useless and it was just polluting lwIP code.

svn path=/branches/GSoC_2011/TcpIpDriver/; revision=52396
This commit is contained in:
Claudiu Mihail 2011-06-21 09:19:12 +00:00
parent 14d4da2565
commit 8e61bd7196
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/drivers/lwip/src/core/tcp.c
View file

@ -769,7 +769,7 @@ tcp_slowtmr(void)
LWIP_ASSERT("tcp_slowtmr: active pcb->state != LISTEN\n", pcb->state != LISTEN); LWIP_ASSERT("tcp_slowtmr: active pcb->state != LISTEN\n", pcb->state != LISTEN);
LWIP_ASSERT("tcp_slowtmr: active pcb->state != TIME-WAIT\n", pcb->state != TIME_WAIT); LWIP_ASSERT("tcp_slowtmr: active pcb->state != TIME-WAIT\n", pcb->state != TIME_WAIT);
LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: active pcb ports (%d -> %d) %d\n", pcb->local_port, pcb->remote_port, pcb->identifier)); LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: active pcb = 0x%x ports (%d -> %d)\n", pcb, pcb->local_port, pcb->remote_port));
pcb_remove = 0; pcb_remove = 0;
pcb_reset = 0; pcb_reset = 0;

15
lib/drivers/lwip/src/core/tcp_in.c
View file

@ -298,7 +298,7 @@ tcp_input(struct pbuf *p, struct netif *inp)
if (pcb != NULL) if (pcb != NULL)
{ {
LWIP_DEBUGF(TCP_DEBUG, ("tcp_input: pcb->id = %d is for active connection\n", pcb->identifier)); LWIP_DEBUGF(TCP_DEBUG, ("tcp_input: pcb = 0x%x is for active connection\n", pcb));
/* The incoming segment belongs to a connection. */ /* The incoming segment belongs to a connection. */
#if TCP_INPUT_DEBUG #if TCP_INPUT_DEBUG
#if TCP_DEBUG #if TCP_DEBUG
@ -535,7 +535,6 @@ tcp_listen_input(struct tcp_pcb_listen *pcb)
for it. */ for it. */
TCP_REG(&tcp_active_pcbs, npcb); TCP_REG(&tcp_active_pcbs, npcb);
npcb->identifier = 21912;
LWIP_DEBUGF(TCP_DEBUG, ("TCP new pcb created with %"U16_F" -> %"U16_F".\n", npcb->local_port, npcb->remote_port)); LWIP_DEBUGF(TCP_DEBUG, ("TCP new pcb created with %"U16_F" -> %"U16_F".\n", npcb->local_port, npcb->remote_port));
/* Parse any options in the SYN. */ /* Parse any options in the SYN. */
@ -683,8 +682,8 @@ tcp_process(struct tcp_pcb *pcb)
pcb->state = ESTABLISHED; pcb->state = ESTABLISHED;
LWIP_DEBUGF(TCP_DEBUG, LWIP_DEBUGF(TCP_DEBUG,
("[tcp_process] (SYN_SENT) TCP connection established %"U16_F" -> %"U16_F", %"U16_F"\n", ("[tcp_process] (SYN_SENT) TCP connection established %"U16_F" -> %"U16_F"\n",
pcb->local_port , pcb->remote_port, pcb->identifier)); pcb->local_port , pcb->remote_port));
#if TCP_CALCULATE_EFF_SEND_MSS #if TCP_CALCULATE_EFF_SEND_MSS
pcb->mss = tcp_eff_send_mss(pcb->mss, &(pcb->remote_ip)); pcb->mss = tcp_eff_send_mss(pcb->mss, &(pcb->remote_ip));
@ -734,11 +733,11 @@ tcp_process(struct tcp_pcb *pcb)
u16_t old_cwnd; u16_t old_cwnd;
pcb->state = ESTABLISHED; pcb->state = ESTABLISHED;
LWIP_DEBUGF(TCP_DEBUG, LWIP_DEBUGF(TCP_DEBUG,
("[tcp_process] (SYN_RCVD) TCP connection established %"U16_F" -> %"U16_F" for %"U16_F"\n", ("[tcp_process] (SYN_RCVD) TCP connection established %"U16_F" -> %"U16_F"\n",
inseg.tcphdr->src, inseg.tcphdr->dest, pcb->identifier)); inseg.tcphdr->src, inseg.tcphdr->dest));
LWIP_DEBUGF(TCP_DEBUG, LWIP_DEBUGF(TCP_DEBUG,
("[tcp_process] (SYN_RCVD) TCP local port = %"U16_F" and ID = %"U16_F"\n", ("[tcp_process] (SYN_RCVD) TCP local port = %"U16_F"\n",
pcb->local_port, pcb->identifier)); pcb->local_port));
#if LWIP_CALLBACK_API #if LWIP_CALLBACK_API
LWIP_ASSERT("pcb->accept != NULL", pcb->accept != NULL); LWIP_ASSERT("pcb->accept != NULL", pcb->accept != NULL);

1
lib/drivers/lwip/src/include/lwip/tcp.h
View file

@ -277,7 +277,6 @@ struct tcp_pcb {
/* KEEPALIVE counter */ /* KEEPALIVE counter */
u8_t keep_cnt_sent; u8_t keep_cnt_sent;
u16_t identifier;
}; };
struct tcp_pcb_listen { struct tcp_pcb_listen {