commit a01bb8e8e285d644c2e59c0ea788e45bf37470f4 Author: George Kadianakis desnacked@riseup.net Date: Thu Jan 24 15:04:10 2013 +0200

Introduce the "bridge-transports" extra-info descriptor field. --- dir-spec.txt | 22 ++++++++++++++++++++++ pt-spec.txt | 5 ++++- 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/dir-spec.txt b/dir-spec.txt index 09a5967..e143b2d 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -680,6 +680,28 @@ List of unique IP addresses that have connected to the bridge per protocol family.

+ "bridge-ip-transports" PT=N,PT=N,... NL + [At most once.] + + List of mappings from pluggable transport names to the number + of unique IP addresses that have connected using that + pluggable transport. Unobfuscated connections are counted + using the reserved pluggable transport name "<OR>" (without + quotes). If we received a connection from a transport proxy + but we couldn't figure out the name of the pluggable + transport, we use the reserved pluggable transport name + "<??>". + + ("<OR>" and "<??>" are reserved because normal pluggable + transport names MUST match the following regular expression: + "[a-zA-Z_][a-zA-Z0-9_]*" ) + + The pluggable transport name list is sorted into lexically + ascending order. + + If no clients have connected to the bridge yet, we only write + "bridge-ip-transports" to the stats file. + "dirreq-stats-end" YYYY-MM-DD HH:MM:SS (NSEC s) NL [At most once.]

diff --git a/pt-spec.txt b/pt-spec.txt index 72662b6..ed136ef 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -38,7 +38,10 @@ Specifications: Client behavior as necessary. If a key or value value must contain a semicolon or a backslash, it is escaped with a backslash.

- Method names must be C identifiers. + Method names MUST be C identifiers. That is, method names must begin + with a letter or underscore and the rest of the characters can be + letters, numbers or underscores. No length limit is imposed. The + relevant regular expression is: "[a-zA-Z_][a-zA-Z0-9_]*".

For reference, the old bridge format was Bridge address[:port] [id-fingerprint]