On Wed, Feb 22, 2017 at 03:09:34PM +0100, Florian Westphal wrote: > Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> wrote: > > Rework syntax, add tokens so we can extend the grammar more easily. > > This has triggered several syntax changes with regards to the original > > patch, specifically: > > > > tcp option sack0 left 1 > > > > There is no space between sack and the block number anymore, no more > > offset field, now they are a single field. Just like we do with rt, rt0 > > and rt2. This simplifies our grammar and that is good since it makes our > > life easier when extending it later on to accomodate new features. > > > > I have also renamed sack_permitted to sack-permitted. I couldn't find > > any option using underscore so far, so let's keep it consistent with > > what we have. > > > > Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> > > --- > > @Florian, @Manuel: I would appreciate an explicit review ack on this patch. > > I am fine with 'sack-permitted' rename. > > As for sack0 etc. I already said 'yuck', pointing at rt2 (not even > documented...) doesn't make it any more pretty to me, sorry. This is not about making things more pretty. This is about making things extensible to accomodate new usecases, as well as to keep it consistent with similar extensions that we have, hence the reference to rtX. > I also still fail to see how this helps/improves grammar state, > all it does is removing > > TCP OPTION STRING NUM tcp_option_field > > and replacing > > TCP OPTION STRING STRING > with > TCP OPTION option_tokens field_tokens > > so user syntax is the same (aside from removal of the 'NUM') > version. Change from string to token is there to accomodate the TCP option exists usecase. > > @@ -2604,13 +2607,33 @@ inet filter meta nfproto ipv6 output rt nexthop fd00::1 > > <entry>kind, length, count</entry> > > </row> > > <row> > > - <entry>sack_permitted</entry> > > + <entry>sack-permitted</entry> > > <entry>TCP SACK permitted</entry> > > <entry>kind, length</entry> > > </row> > > <row> > > <entry>sack</entry> > > - <entry>TCP Selective Acknowledgement</entry> > > + <entry>TCP Selective Acknowledgement (alias of block 0)</entry> > > + <entry>kind, length, left, right</entry> > > + </row> > > + <row> > > + <entry>sack0</entry> > > + <entry>TCP Selective Acknowledgement (block 0)</entry> > > + <entry>kind, length, left, right</entry> > > + </row> > > + <row> > > + <entry>sack1</entry> > > + <entry>TCP Selective Acknowledgement (block 1)</entry> > > + <entry>kind, length, left, right</entry> > > Thats the thing, sack1 doesn't have kind or length. We can reject any invalid combination from the evaluation phase. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
