summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/ast-db-manage/config/versions/81b01a191a46_pjsip_add_contact_reg_server.py2
-rw-r--r--main/config_options.c2
-rw-r--r--main/stasis_endpoints.c7
3 files changed, 9 insertions, 2 deletions
diff --git a/contrib/ast-db-manage/config/versions/81b01a191a46_pjsip_add_contact_reg_server.py b/contrib/ast-db-manage/config/versions/81b01a191a46_pjsip_add_contact_reg_server.py
index 8bd151bd7..c25fc7233 100644
--- a/contrib/ast-db-manage/config/versions/81b01a191a46_pjsip_add_contact_reg_server.py
+++ b/contrib/ast-db-manage/config/versions/81b01a191a46_pjsip_add_contact_reg_server.py
@@ -21,5 +21,5 @@ def upgrade():
def downgrade():
op.drop_constraint('ps_contacts_uq', 'ps_contacts', type_='unique')
- op.drop_column('reg_server')
+ op.drop_column('ps_contacts', 'reg_server')
op.create_unique_constraint(None, 'ps_contacts', 'id')
diff --git a/main/config_options.c b/main/config_options.c
index e59e5cf7a..c58dfdd86 100644
--- a/main/config_options.c
+++ b/main/config_options.c
@@ -198,8 +198,8 @@ static int link_option_to_types(struct aco_info *info, struct aco_type **types,
#ifdef AST_DEVMODE
opt->doc_unavailable = 1;
#endif
-#endif
}
+#endif
}
/* The container(s) should hold the only ref to opt */
ao2_ref(opt, -1);
diff --git a/main/stasis_endpoints.c b/main/stasis_endpoints.c
index 931bbb97d..14d3d0ca1 100644
--- a/main/stasis_endpoints.c
+++ b/main/stasis_endpoints.c
@@ -86,6 +86,7 @@ ASTERISK_REGISTER_FILE()
<enum name="Reachable"/>
<enum name="Created"/>
<enum name="Removed"/>
+ <enum name="Updated"/>
</enumlist>
</parameter>
<parameter name="AOR">
@@ -97,6 +98,12 @@ ASTERISK_REGISTER_FILE()
<parameter name="RoundtripUsec">
<para>The RTT measured during the last qualify.</para>
</parameter>
+ <parameter name="UserAgent">
+ <para>Content of the User-Agent header in REGISTER request</para>
+ </parameter>
+ <parameter name="RegExpire">
+ <para>Absolute time that this contact is no longer valid after</para>
+ </parameter>
</syntax>
</managerEventInstance>
</managerEvent>