espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-13 20:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tcp] remove extraneous #define and restrict inclusion of TCPlp headers (#7570)

Browse Source 
* remove extraneous #define
* restrict inclusion of `third_party/tcplp/tcplp.h`
This commit is contained in:
Sam Kumar
2022-04-07 10:42:17 -07:00
committed by GitHub
parent 97a7910172
commit cda71d1b25
7 changed files with 84 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/tcplp/bsdtcp/tcp.h
Vendored
-2
View File
@@ -43,8 +43,6 @@
#include <stdint.h>
#include <stdio.h>
#define __func__ "BSD TCP function"
#define KASSERT(COND, MSG) if (!(COND)) tcplp_sys_panic MSG
typedef uint32_t tcp_seq;
third_party/tcplp/bsdtcp/tcp_input.c
Vendored
+3 -3
View File
@@ -103,7 +103,7 @@ static void tcp_dooptions(struct tcpopt *, uint8_t *, int, int);
static void
tcp_do_segment(struct ip6_hdr* ip6, struct tcphdr *th, otMessage* msg,
struct tcpcb *tp, int drop_hdrlen, int tlen, uint8_t iptos,
struct signals* sig);
struct tcplp_signals* sig);
static void tcp_xmit_timer(struct tcpcb *, int);
void tcp_hc_get(/*struct in_conninfo *inc*/ struct tcpcb* tp, struct hc_metrics_lite *hc_metrics_lite);
static void tcp_newreno_partial_ack(struct tcpcb *, struct tcphdr *);
@@ -431,7 +431,7 @@ tcp_dropwithreset(struct ip6_hdr* ip6, struct tcphdr *th, struct tcpcb *tp, otIn
/* NOTE: tcp_fields_to_host(th) must be called before this function is called. */
int
tcp_input(struct ip6_hdr* ip6, struct tcphdr* th, otMessage* msg, struct tcpcb* tp, struct tcpcb_listen* tpl,
struct signals* sig)
struct tcplp_signals* sig)
{
/*
* samkumar: I significantly modified this function, compared to the
@@ -948,7 +948,7 @@ drop:
static void
tcp_do_segment(struct ip6_hdr* ip6, struct tcphdr *th, otMessage* msg,
struct tcpcb *tp, int drop_hdrlen, int tlen, uint8_t iptos,
struct signals* sig)
struct tcplp_signals* sig)
{
/*
* samkumar: All code pertaining to locks, stats, and debug has been
third_party/tcplp/bsdtcp/tcp_reass.c
Vendored
+1 -1
View File
@@ -51,7 +51,7 @@
* not need to update it if only part of the segment is trimmed off.
*/
int
tcp_reass(struct tcpcb* tp, struct tcphdr* th, int* tlenp, otMessage* data, off_t data_offset, struct signals* sig)
tcp_reass(struct tcpcb* tp, struct tcphdr* th, int* tlenp, otMessage* data, off_t data_offset, struct tcplp_signals* sig)
{
size_t mergeable, written;
size_t offset;
third_party/tcplp/bsdtcp/tcp_var.h
Vendored
+3 -3
View File
@@ -161,7 +161,7 @@ struct tcpcb_listen {
#define SACKHOLE_POOL_SIZE MAX_SACKHOLES
#define SACKHOLE_BMP_SIZE BITS_TO_BYTES(SACKHOLE_POOL_SIZE)
struct signals;
struct tcplp_signals;
/*
* Tcp control block, one per tcp; fields:
@@ -577,14 +577,14 @@ int tcp_twcheck(struct tcpcb*, struct tcphdr *, int);
void tcp_dropwithreset(struct ip6_hdr* ip6, struct tcphdr *th, struct tcpcb *tp, otInstance* instance,
int tlen, int rstreason);
int tcp_input(struct ip6_hdr* ip6, struct tcphdr* th, otMessage* msg, struct tcpcb* tp, struct tcpcb_listen* tpl,
struct signals* sig);
struct tcplp_signals* sig);
int tcp_output(struct tcpcb *);
void tcpip_maketemplate(struct tcpcb *, struct tcptemp*);
void tcpip_fillheaders(struct tcpcb *, otMessageInfo *, void *);
uint64_t tcp_maxmtu6(struct tcpcb*, struct tcp_ifcap *);
int tcp_addoptions(struct tcpopt *, uint8_t *);
int tcp_mssopt(struct tcpcb*);
int tcp_reass(struct tcpcb *, struct tcphdr *, int *, otMessage *, off_t, struct signals*);
int tcp_reass(struct tcpcb *, struct tcphdr *, int *, otMessage *, off_t, struct tcplp_signals*);
void tcp_sack_init(struct tcpcb *); // Sam: new function that I added
void tcp_sack_doack(struct tcpcb *, struct tcpopt *, tcp_seq);
void tcp_update_sack_list(struct tcpcb *tp, tcp_seq rcv_laststart, tcp_seq rcv_lastend);
third_party/tcplp/tcplp.h
Vendored
+1 -1
View File
@@ -53,7 +53,7 @@ extern "C" {
#define RELOOKUP_REQUIRED -1
#define CONN_LOST_NORMAL 0
struct signals {
struct tcplp_signals {
int links_popped;
bool conn_established;
bool recvbuf_notempty;