Merge remote-tracking branch 'kiszka/queues/slirp' into staging (8f440cda) · Commits · SUMMER2020 / students / proj-2021291

slirp/mbuf.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -82,12 +82,13 @@ struct m_hdr {
		struct mbuf {
		struct m_hdr m_hdr;
		Slirp *slirp;
		bool arp_requested;
		uint64_t expiration_date;
		/* start of dynamic buffer area, must be last element */
		union M_dat {
		char m_dat_[1]; /* ANSI don't like 0 sized arrays */
		char *m_ext_;
		} M_dat;
		bool arp_requested;
		uint64_t expiration_date;
		};

		#define m_next m_hdr.mh_next

+10 −12

Original line number	Diff line number	Diff line
		@@ -1156,6 +1156,16 @@ step6:
		tp->rcv_up = tp->rcv_nxt;
		dodata:

		/*
		* If this is a small packet, then ACK now - with Nagel
		* congestion avoidance sender won't send more until
		* he gets an ACK.
		*/
		if (ti->ti_len && (unsigned)ti->ti_len <= 5 &&
		((struct tcpiphdr_2 *)ti)->first_char == (char)27) {
		tp->t_flags \|= TF_ACKNOW;
		}

		/*
		* Process the segment text, merging it into the TCP sequencing queue,
		* and arranging for acknowledgment of receipt if necessary.
		@@ -1234,18 +1244,6 @@ dodata:
		}
		}

		/*
		* If this is a small packet, then ACK now - with Nagel
		* congestion avoidance sender won't send more until
		* he gets an ACK.
		*
		* See above.
		*/
		if (ti->ti_len && (unsigned)ti->ti_len <= 5 &&
		((struct tcpiphdr_2 *)ti)->first_char == (char)27) {
		tp->t_flags \|= TF_ACKNOW;
		}

		/*
		* Return any desired output.
		*/