diff options
author | Reyk Floeter <reyk@cvs.openbsd.org> | 2011-04-12 12:37:23 +0000 |
---|---|---|
committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2011-04-12 12:37:23 +0000 |
commit | 7e34b8858905860813099bc43242445b9f7b9254 (patch) | |
tree | 945781f50161eb71ed91dd4cd0fbb6d8711e4322 /usr.sbin/relayd/parse.y | |
parent | a17985a64e402cbcd2a30570eab2d6e2b6919e67 (diff) |
update flags and printing of flags in debug mode, handle splicing flag.
Diffstat (limited to 'usr.sbin/relayd/parse.y')
-rw-r--r-- | usr.sbin/relayd/parse.y | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index f41bd721ab3..3c79f2a4ff7 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.150 2011/04/07 13:22:29 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.151 2011/04/12 12:37:22 reyk Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org> @@ -147,7 +147,7 @@ typedef struct { %token LOADBALANCE LOG LOOKUP MARK MARKED MODE NAT NO DESTINATION %token NODELAY NOTHING ON PARENT PATH PORT PREFORK PROTO %token QUERYSTR REAL REDIRECT RELAY REMOVE REQUEST RESPONSE RETRY -%token RETURN ROUNDROBIN ROUTE SACK SCRIPT SEND SESSION SOCKET +%token RETURN ROUNDROBIN ROUTE SACK SCRIPT SEND SESSION SOCKET SPLICE %token SSL STICKYADDR STYLE TABLE TAG TCP TIMEOUT TO ROUTER RTLABEL %token TRANSPARENT TRAP UPDATES URL VIRTUAL WITH TTL RTABLE MATCH %token <v.string> STRING @@ -875,6 +875,8 @@ tcpflags : SACK { proto->tcpflags |= TCPFLAG_SACK; } | NO SACK { proto->tcpflags |= TCPFLAG_NSACK; } | NODELAY { proto->tcpflags |= TCPFLAG_NODELAY; } | NO NODELAY { proto->tcpflags |= TCPFLAG_NNODELAY; } + | SPLICE { /* default */ } + | NO SPLICE { proto->tcpflags |= TCPFLAG_NSPLICE; } | BACKLOG NUMBER { if ($2 < 0 || $2 > RELAY_MAX_SESSIONS) { yyerror("invalid backlog: %d", $2); @@ -1785,6 +1787,7 @@ lookup(char *s) { "send", SEND }, { "session", SESSION }, { "socket", SOCKET }, + { "splice", SPLICE }, { "ssl", SSL }, { "sticky-address", STICKYADDR }, { "style", STYLE }, |