From 2a1b36b3082412c6723ec29c1fc1ef02589bd3b3 Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Sat, 2 Jun 2012 14:45:26 -0400 Subject: DSCP: take numeric values too. Also fix doc claim that value is unexpanded. Also strip affix whitespace before numeric conversion and fixed string comparison. --- doc/doc-docbook/spec.xfpt | 9 +++++---- doc/doc-txt/NewStuff | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 15a8f3550..d370cbc3f 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -22102,13 +22102,14 @@ details. .new -.option dscp smtp string unset +.option dscp smtp string&!! unset .cindex "DCSP" .cindex "DiffServ" This option causes the DSCP value associated with a socket to be set to one -of a number of fixed strings. The &%-bI:dscp%& option may be used to ask -Exim which values it knows of. Common values include &`throughput`&, -&`mincost`&, and on newer systems &`ef`&, &`af41`&, ... +of a number of fixed strings or to numeric value. +The &%-bI:dscp%& option may be used to ask Exim which names it knows of. +Common values include &`throughput`&, &`mincost`&, and on newer systems +&`ef`&, &`af41`&, etc. Numeric values may be in the range 0 to 0x3F. The outbound packets from Exim will be marked with this value in the header (for IPv4, the TOS field; for IPv6, the TCLASS field); there is no guarantee diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 2aaf56232..e33d2858c 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -43,6 +43,7 @@ Version 4.81 set "dscp = ef", for instance, to cause the connections to have the relevant DSCP (IPv4 TOS or IPv6 TCLASS) value in the header. Supported values depend upon system libraries. "exim -bI:dscp" to list the ones Exim knows of. + You can also set a raw number 0..0x3F. Version 4.80 -- cgit v1.2.3