Skip to content

Commit 25078bd

Browse files
[mid-]registrar: add migration hints for new named flags
1 parent a06bc52 commit 25078bd

File tree

2 files changed

+30
-26
lines changed

2 files changed

+30
-26
lines changed

lib/reg/doc/lookup_flags.xml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<itemizedlist>
44
<listitem>
55
<para>
6-
<emphasis>'no-branches'</emphasis> - this flag controls how
7-
the &reg_lookup_f; function processes multiple contacts.
6+
<emphasis>'no-branches'</emphasis> - (old <emphasis>b</emphasis> flag) this
7+
flag controls how the &reg_lookup_f; function processes multiple contacts.
88
If there are
99
multiple contacts for the given username in usrloc and this
1010
flag is not set, Request-URI will be overwritten with the
@@ -18,8 +18,8 @@
1818

1919
<listitem>
2020
<para>
21-
<emphasis>'to-branches-only'</emphasis> - this flags forces
22-
all found contacts to be uploaded only as branches (in the
21+
<emphasis>'to-branches-only'</emphasis> - (old <emphasis>B</emphasis> flag)
22+
this flags forces all found contacts to be uploaded only as branches (in the
2323
destination set) and not at all in the R-URI of the
2424
current message. Using this option allows the &reg_lookup_f; function to
2525
also be used in the context of a SIP reply.
@@ -28,8 +28,8 @@
2828

2929
<listitem>
3030
<para>
31-
<emphasis>'branch'</emphasis> - this flag enables
32-
searching through existing branches for aor's and expanding
31+
<emphasis>'branch'</emphasis> - (old <emphasis>r</emphasis> flag) this flag
32+
enables searching through existing branches for aor's and expanding
3333
them to contacts. For example, you have got AOR A in your
3434
ruri but you also want to forward your calls to AOR B. In order
3535
to do this, you must put AOR B in a branch, and if this flag
@@ -48,37 +48,38 @@
4848

4949
<listitem>
5050
<para>
51-
<emphasis>'method-filtering'</emphasis> - setting this flag
52-
will enable contact filtering based on the supported methods
51+
<emphasis>'method-filtering'</emphasis> - (old <emphasis>m</emphasis> flag)
52+
setting this flag will enable contact filtering based on the supported methods
5353
listed in the "Allow" header field during registration.
5454
Contacts which did not present an "Allow" header field during
5555
registration are assumed to support all standard SIP methods.
5656
</para>
5757
</listitem>
5858
<listitem>
5959
<para>
60-
<emphasis>'ua-filtering=[val]'</emphasis> (User-Agent filtering) - this flag
61-
enables regexp filtering by user-agent. It's useful with
62-
enabled append_branches parameter. The value must use the format '/regexp/'.
60+
<emphasis>'ua-filtering=[val]'</emphasis> (old <emphasis>u</emphasis> flag)
61+
(User-Agent filtering) - this flag enables regexp filtering by user-agent.
62+
It's useful with enabled append_branches parameter. The value must use the
63+
format '/regexp/'.
6364
</para>
6465
</listitem>
6566
<listitem>
6667
<para>
67-
<emphasis>'case-insensitive'</emphasis> - this flag
68-
enables case insensitive filtering for the 'ua-filtering' flag.
68+
<emphasis>'case-insensitive'</emphasis> (old <emphasis>i</emphasis> flag) -
69+
this flag enables case insensitive filtering for the 'ua-filtering' flag.
6970
</para>
7071
</listitem>
7172
<listitem>
7273
<para>
73-
<emphasis>'extended-regexp'</emphasis> - this flag
74-
enables using of extended regexp format for the 'ua-filtering' flag.
74+
<emphasis>'extended-regexp'</emphasis> - (old <emphasis>e</emphasis> flag)
75+
this flag enables using of extended regexp format for the 'ua-filtering' flag.
7576
</para>
7677
</listitem>
7778
<listitem>
7879
<para>
79-
<emphasis>'global'</emphasis> (Global lookup) - this flag
80-
is only relevant with federated user location clustering. If
81-
set, the &reg_lookup_f; function will not only perform the classic
80+
<emphasis>'global'</emphasis> (old <emphasis>g</emphasis> flag) (Global
81+
lookup) - this flag is only relevant with federated user location clustering.
82+
If set, the &reg_lookup_f; function will not only perform the classic
8283
in-memory "search-AoR-and-push-branches" operation, but will
8384
also perform a metadata lookup and append an additional branch
8485
for each returned result. The "in-memory branches" correspond
@@ -108,15 +109,15 @@
108109
</listitem>
109110
<listitem>
110111
<para>
111-
<emphasis>'max-ping-latency=[int]'</emphasis> - maximally
112-
accepted contact pinging latency (microseconds). Contacts of an
112+
<emphasis>'max-ping-latency=[int]'</emphasis> - (old <emphasis>y</emphasis>
113+
flag) maximally accepted contact pinging latency (microseconds). Contacts of an
113114
AoR with a higher latency will be discarded during &reg_lookup_f;.
114115
</para>
115116
</listitem>
116117
<listitem>
117118
<para>
118-
<emphasis>'sort-by-latency'</emphasis> - contacts
119-
will be picked in ascending order of their last successful
119+
<emphasis>'sort-by-latency'</emphasis> - (old <emphasis>Y</emphasis> flag)
120+
contacts will be picked in ascending order of their last successful
120121
pinging latency (fastest ping -> slowest ping). This flag may
121122
work together with the "max-ping-latency" flag.
122123
</para>

modules/registrar/doc/registrar_admin.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,14 +487,16 @@ modparam("registrar", "disable_gruu", 0)
487487
<itemizedlist>
488488
&save_common_flags;
489489
<listitem>
490-
<para><emphasis>'socket-header'</emphasis> -
491-
look into REGISTER request for a header which contains a socket
490+
<para><emphasis>'socket-header'</emphasis> - (old
491+
<emphasis>s</emphasis> flag) look into REGISTER request
492+
for a header which contains a socket
492493
description (proto:IP:port). This socket info will be
493494
stored by register instead of the received socket info.
494495
</para>
495496
</listitem>
496497
<listitem>
497-
<para><emphasis>'min-expires=[int]'</emphasis> - this
498+
<para><emphasis>'min-expires=[int]'</emphasis> - (old
499+
<emphasis>e</emphasis> flag) this
498500
flag can be used to set minimum register expiration time.
499501
Values lower than this minimum will be automatically set
500502
to the minimum. Value 0 disables the checking.
@@ -503,7 +505,8 @@ modparam("registrar", "disable_gruu", 0)
503505
</para>
504506
</listitem>
505507
<listitem>
506-
<para><emphasis>'max-expires=[int]'</emphasis> - this
508+
<para><emphasis>'max-expires=[int]'</emphasis> - (old
509+
<emphasis>E</emphasis> flag) this
507510
flag can be used to set maximum register expiration time.
508511
Values higher than this maximum will be automatically set
509512
to the maximum. Value 0 disables the checking.

0 commit comments

Comments
 (0)