/*
 * netsniff-ng - the packet sniffing beast
 * Copyright 2012 Markus Amend <markus@netsniff-ng.org>, Deutsche Flugsicherung GmbH
 * Subject to the GPL, version 2.
 *
 * http://www.ieee802.org/1/pages/802.1ad.html
 */

#include <stdio.h>
#include <stdint.h>
#include <netinet/in.h>    /* for ntohs() */

#include "proto.h"
#include "dissector_eth.h"
#include "built_in.h"
#include "pkt_buff.h"

struct QinQhdr {
	uint16_t TCI;
	uint16_t TPID;
} __packed;

static void QinQ_full(struct pkt_buff *pkt)
{
	uint16_t tci;
	struct QinQhdr *QinQ = (struct QinQhdr *) pkt_pull(pkt, sizeof(*QinQ));

	if (QinQ == NULL)
		return;

	tci = ntohs(QinQ->TCI);

	tprintf(" [ VLAN QinQ ");
	tprintf("Prio (%d), ", (tci & 0xE000) >> 13);
	tprintf("DEI (%d), ", (tci & 0x1000) >> 12);
	tprintf("ID (%d), ", (tci & 0x0FFF));
	tprintf("Proto (0x%.4x)", ntohs(QinQ->TPID));
	tprintf(" ]\n");

	pkt_set_dissector(pkt, &eth_lay2, ntohs(QinQ->TPID));
}

static void QinQ_less(struct pkt_buff *pkt)
{
	uint16_t tci;
	struct QinQhdr *QinQ = (struct QinQhdr *) pkt_pull(pkt, sizeof(*QinQ));

	if (QinQ == NULL)
		return;

	tci = ntohs(QinQ->TCI);

	tprintf(" VLAN%d", (tci & 0x0FFF));

	pkt_set_dissector(pkt, &eth_lay2, ntohs(QinQ->TPID));
}

struct protocol QinQ_ops = {
	.key = 0x88a8,
	.print_full = QinQ_full,
	.print_less = QinQ_less,
};
-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/?h=nds-private-remove'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?h=nds-private-remove&amp;id=70790dbe3f6651fb66ad38da0a1e24368778bc16'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/?h=nds-private-remove'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&amp;id=70790dbe3f6651fb66ad38da0a1e24368778bc16'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=70790dbe3f6651fb66ad38da0a1e24368778bc16'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=70790dbe3f6651fb66ad38da0a1e24368778bc16'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/'>
<input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='70790dbe3f6651fb66ad38da0a1e24368778bc16'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='70790dbe3f6651fb66ad38da0a1e24368778bc16'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>David Howells &lt;dhowells@redhat.com&gt;</td><td class='right'>2016-09-23 12:39:22 +0100</td></tr>
<tr><th>committer</th><td>David Howells &lt;dhowells@redhat.com&gt;</td><td class='right'>2016-09-23 15:49:19 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=70790dbe3f6651fb66ad38da0a1e24368778bc16'>70790dbe3f6651fb66ad38da0a1e24368778bc16</a> (<a href='/cgit.cgi/linux/net-next.git/patch/?id=70790dbe3f6651fb66ad38da0a1e24368778bc16'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&amp;id=70790dbe3f6651fb66ad38da0a1e24368778bc16'>baa3dd1cf168385d24f7b631a6a75763f6b82cd4</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=01a88f7f6bd4514de9551c3fc9a6fd9e65cbf79d'>01a88f7f6bd4514de9551c3fc9a6fd9e65cbf79d</a> (<a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=70790dbe3f6651fb66ad38da0a1e24368778bc16&amp;id2=01a88f7f6bd4514de9551c3fc9a6fd9e65cbf79d'>diff</a>)</td></tr></table>
<div class='commit-subject'>rxrpc: Pass the last Tx packet marker in the annotation buffer</div><div class='commit-msg'>When the last packet of data to be transmitted on a call is queued, tx_top
is set and then the RXRPC_CALL_TX_LAST flag is set.  Unfortunately, this
leaves a race in the ACK processing side of things because the flag affects
the interpretation of tx_top and also allows us to start receiving reply
data before we've finished transmitting.

To fix this, make the following changes:

 (1) rxrpc_queue_packet() now sets a marker in the annotation buffer
     instead of setting the RXRPC_CALL_TX_LAST flag.

 (2) rxrpc_rotate_tx_window() detects the marker and sets the flag in the
     same context as the routines that use it.

 (3) rxrpc_end_tx_phase() is simplified to just shift the call state.
     The Tx window must have been rotated before calling to discard the
     last packet.

 (4) rxrpc_receiving_reply() is added to handle the arrival of the first
     DATA packet of a reply to a client call (which is an implicit ACK of
     the Tx phase).

 (5) The last part of rxrpc_input_ack() is reordered to perform Tx
     rotation, then soft-ACK application and then to end the phase if we've
     rotated the last packet.  In the event of a terminal ACK, the soft-ACK
     application will be skipped as nAcks should be 0.

 (6) rxrpc_input_ackall() now has to rotate as well as ending the phase.

In addition:

 (7) Alter the transmit tracepoint to log the rotation of the last packet.

 (8) Remove the no-longer relevant queue_reqack tracepoint note.  The
     ACK-REQUESTED packet header flag is now set as needed when we actually
     transmit the packet and may vary by retransmission.

Signed-off-by: David Howells &lt;dhowells@redhat.com&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=70790dbe3f6651fb66ad38da0a1e24368778bc16'>Diffstat</a></div><table summary='diffstat' class='diffstat'>