diff options
Diffstat (limited to 'ext/lwip/src/core/tcp_out.c')
| -rw-r--r-- | ext/lwip/src/core/tcp_out.c | 42 | 
1 files changed, 20 insertions, 22 deletions
| diff --git a/ext/lwip/src/core/tcp_out.c b/ext/lwip/src/core/tcp_out.c index d0b71d19..ee19fe06 100644 --- a/ext/lwip/src/core/tcp_out.c +++ b/ext/lwip/src/core/tcp_out.c @@ -197,7 +197,7 @@ tcp_create_segment(struct tcp_pcb *pcb, struct pbuf *p, u8_t flags, u32_t seqno,    /* wnd and chksum are set in tcp_output */    seg->tcphdr->urgp = 0;    return seg; -} +}   /**   * Allocate a PBUF_RAM pbuf, perhaps with extra space at the end. @@ -212,7 +212,7 @@ tcp_create_segment(struct tcp_pcb *pcb, struct pbuf *p, u8_t flags, u32_t seqno,   * @param pcb The TCP connection that willo enqueue the pbuf.   * @param apiflags API flags given to tcp_write.   * @param first_seg true when this pbuf will be used in the first enqueued segment. - * @param + * @param    */  #if TCP_OVERSIZE  static struct pbuf * @@ -324,7 +324,6 @@ tcp_write_checks(struct tcp_pcb *pcb, u16_t len)      pcb->flags |= TF_NAGLEMEMERR;      return ERR_MEM;    } -  /*    if (pcb->snd_queuelen != 0) {      LWIP_ASSERT("tcp_write: pbufs on queue => at least one queue non-empty",        pcb->unacked != NULL || pcb->unsent != NULL); @@ -332,7 +331,6 @@ tcp_write_checks(struct tcp_pcb *pcb, u16_t len)      LWIP_ASSERT("tcp_write: no pbufs on queue => both queues empty",        pcb->unacked == NULL && pcb->unsent == NULL);    } -  */    return ERR_OK;  } @@ -381,7 +379,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)    LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_write(pcb=%p, data=%p, len=%"U16_F", apiflags=%"U16_F")\n",      (void *)pcb, arg, len, (u16_t)apiflags)); -  LWIP_ERROR("tcp_write: arg == NULL (programmer violates API)", +  LWIP_ERROR("tcp_write: arg == NULL (programmer violates API)",                arg != NULL, return ERR_ARG;);    err = tcp_write_checks(pcb, len); @@ -859,7 +857,7 @@ tcp_send_empty_ack(struct tcp_pcb *pcb)      return ERR_BUF;    }    tcphdr = (struct tcp_hdr *)p->payload; -  LWIP_DEBUGF(TCP_OUTPUT_DEBUG, +  LWIP_DEBUGF(TCP_OUTPUT_DEBUG,                 ("tcp_output: sending ACK for %"U32_F"\n", pcb->rcv_nxt));    /* remove ACK flags from the PCB, as we send an empty ACK now */    pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW); @@ -871,7 +869,7 @@ tcp_send_empty_ack(struct tcp_pcb *pcb)    if (pcb->flags & TF_TIMESTAMP) {      tcp_build_timestamp_option(pcb, (u32_t *)(tcphdr + 1));    } -#endif +#endif   #if CHECKSUM_GEN_TCP    tcphdr->chksum = inet_chksum_pseudo(p, &(pcb->local_ip), &(pcb->remote_ip), @@ -952,7 +950,7 @@ tcp_output(struct tcp_pcb *pcb)                                   ", seg == NULL, ack %"U32_F"\n",                                   pcb->snd_wnd, pcb->cwnd, wnd, pcb->lastack));    } else { -    LWIP_DEBUGF(TCP_CWND_DEBUG, +    LWIP_DEBUGF(TCP_CWND_DEBUG,                   ("tcp_output: snd_wnd %"U16_F", cwnd %"U16_F", wnd %"U32_F                   ", effwnd %"U32_F", seq %"U32_F", ack %"U32_F"\n",                   pcb->snd_wnd, pcb->cwnd, wnd, @@ -963,7 +961,7 @@ tcp_output(struct tcp_pcb *pcb)    /* data available and window allows it to be sent? */    while (seg != NULL &&           ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len <= wnd) { -    LWIP_ASSERT("RST not expected here!", +    LWIP_ASSERT("RST not expected here!",                   (TCPH_FLAGS(seg->tcphdr) & TCP_RST) == 0);      /* Stop sending if the nagle algorithm would prevent it       * Don't stop: @@ -1088,7 +1086,7 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb)    }  #endif -  /* Set retransmission timer running if it is not currently enabled +  /* Set retransmission timer running if it is not currently enabled        This must be set before checking the route. */    if (pcb->rtime == -1) {      pcb->rtime = 0; @@ -1319,12 +1317,12 @@ tcp_rexmit(struct tcp_pcb *pcb)   *   * @param pcb the tcp_pcb for which to retransmit the first unacked segment   */ -void +void   tcp_rexmit_fast(struct tcp_pcb *pcb)  {    if (pcb->unacked != NULL && !(pcb->flags & TF_INFR)) {      /* This is fast retransmit. Retransmit the first unacked segment. */ -    LWIP_DEBUGF(TCP_FR_DEBUG, +    LWIP_DEBUGF(TCP_FR_DEBUG,                   ("tcp_receive: dupacks %"U16_F" (%"U32_F                   "), fast retransmit %"U32_F"\n",                   (u16_t)pcb->dupacks, pcb->lastack, @@ -1338,19 +1336,19 @@ tcp_rexmit_fast(struct tcp_pcb *pcb)      } else {        pcb->ssthresh = pcb->cwnd / 2;      } - +          /* The minimum value for ssthresh should be 2 MSS */      if (pcb->ssthresh < 2*pcb->mss) { -      LWIP_DEBUGF(TCP_FR_DEBUG, +      LWIP_DEBUGF(TCP_FR_DEBUG,                     ("tcp_receive: The minimum value for ssthresh %"U16_F                     " should be min 2 mss %"U16_F"...\n",                     pcb->ssthresh, 2*pcb->mss));        pcb->ssthresh = 2*pcb->mss;      } - +          pcb->cwnd = pcb->ssthresh + 3 * pcb->mss;      pcb->flags |= TF_INFR; -  } +  }   } @@ -1372,12 +1370,12 @@ tcp_keepalive(struct tcp_pcb *pcb)                            ip4_addr1_16(&pcb->remote_ip), ip4_addr2_16(&pcb->remote_ip),                            ip4_addr3_16(&pcb->remote_ip), ip4_addr4_16(&pcb->remote_ip))); -  LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: tcp_ticks %"U32_F"   pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n", +  LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: tcp_ticks %"U32_F"   pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n",                             tcp_ticks, pcb->tmr, pcb->keep_cnt_sent)); - +       p = tcp_output_alloc_header(pcb, 0, 0, htonl(pcb->snd_nxt - 1));    if(p == NULL) { -    LWIP_DEBUGF(TCP_DEBUG, +    LWIP_DEBUGF(TCP_DEBUG,                   ("tcp_keepalive: could not allocate memory for pbuf\n"));      return;    } @@ -1421,15 +1419,15 @@ tcp_zero_window_probe(struct tcp_pcb *pcb)    u16_t len;    u8_t is_fin; -  LWIP_DEBUGF(TCP_DEBUG, +  LWIP_DEBUGF(TCP_DEBUG,                 ("tcp_zero_window_probe: sending ZERO WINDOW probe to %"                 U16_F".%"U16_F".%"U16_F".%"U16_F"\n",                 ip4_addr1_16(&pcb->remote_ip), ip4_addr2_16(&pcb->remote_ip),                 ip4_addr3_16(&pcb->remote_ip), ip4_addr4_16(&pcb->remote_ip))); -  LWIP_DEBUGF(TCP_DEBUG, +  LWIP_DEBUGF(TCP_DEBUG,                 ("tcp_zero_window_probe: tcp_ticks %"U32_F -               "   pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n", +               "   pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n",                  tcp_ticks, pcb->tmr, pcb->keep_cnt_sent));    seg = pcb->unacked; | 
