Skip to content

Commit

Permalink
rtpproxy: remove deprecated files
Browse files Browse the repository at this point in the history
  • Loading branch information
@razvancrainea
razvancrainea committed Feb 10, 2017
1 parent 73d5fa5 commit 4e09501
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 102 deletions.
33 changes: 11 additions & 22 deletions modules/rtpproxy/README
View file
Expand Up @@ -46,9 +46,7 @@ Bogdan-Andrei Iancu

1.6. Exported Functions

1.6.1. engage_rtp_proxy([flags [, ip_address [,
set_id [, sock_pvar]]]]) - deprecated,
rtpproxy_engage([flags [, ip_address [,
1.6.1. rtpproxy_engage([flags [, ip_address [,
set_id [, sock_pvar]]]])

1.6.2. rtpproxy_offer([flags [, ip_address [, set_id
Expand All @@ -57,10 +55,7 @@ Bogdan-Andrei Iancu
1.6.3. rtpproxy_answer([flags [, ip_address [,
set_id [, sock_pvar]]]])

1.6.4. unforce_rtp_proxy([set_id [, sock_pvar]]) -
deprecated, rtpproxy_unforce([set_id [,
sock_pvar]])

1.6.4. rtpproxy_unforce([set_id [, sock_pvar]])
1.6.5. rtpproxy_stream2uac(prompt_name, count [,
set_id [, sock_pvar]]),
rtpproxy_stream2uas(prompt_name, count [,
Expand All @@ -71,9 +66,8 @@ Bogdan-Andrei Iancu
rtpproxy_stop_stream2uas([set_id [,
sock_pvar]])

1.6.7. start_recording([set_id [, sock_pvar]]) -
deprecated, rtpproxy_start_recording([set_id
[, sock_pvar]])
1.6.7. rtpproxy_start_recording([set_id [,
sock_pvar]])

1.6.8. rtpproxy_stats(up_pvar, down_pvar, sent_pvar,
fail_pvar [, set_id [, sock_pvar]])
Expand Down Expand Up @@ -144,12 +138,10 @@ Chapter 1. Admin Guide
rtpproxies (with a different weight value than 0) respond.
Default weight is 1.

Starting with OpenSIPS 1.11, the set_rtp_proxy_set() function
has been removed. The set is now specified for each function.
If absend, the default set 0 is used. Also, engage_rtp_proxy(),
Starting with OpenSIPS 2.1, engage_rtp_proxy(),
unforce_rtp_proxy() and start_recording() functions have been
deprecated and replaced by rtpproxy_engage(),
rtpproxy_unforce() and rtpproxy_start_recording() respectively.
fully replaced by rtpproxy_engage(), rtpproxy_unforce() and
rtpproxy_start_recording().

IMPORTANT: if you use multiple sets, make sure you use the same
set for both rtpproxy_offer()/rtpproxy_answer() and
Expand Down Expand Up @@ -403,9 +395,8 @@ modparam("rtpproxy", "rtpp_notify_socket", "tcp:10.10.10.10:9999")

1.6. Exported Functions

1.6.1. engage_rtp_proxy([flags [, ip_address [, set_id [,
sock_pvar]]]]) - deprecated, rtpproxy_engage([flags [, ip_address [,
set_id [, sock_pvar]]]])
1.6.1. rtpproxy_engage([flags [, ip_address [, set_id [,
sock_pvar]]]])

Rewrites SDP body to ensure that media is passed through an RTP
proxy. It uses the dialog module facilities to keep track when
Expand Down Expand Up @@ -558,8 +549,7 @@ sock_pvar]]]])

See rtpproxy_offer() function example above for example.

1.6.4. unforce_rtp_proxy([set_id [, sock_pvar]]) - deprecated,
rtpproxy_unforce([set_id [, sock_pvar]])
1.6.4. rtpproxy_unforce([set_id [, sock_pvar]])

Tears down the RTPProxy session for the current call.

Expand Down Expand Up @@ -643,8 +633,7 @@ rtpproxy_stop_stream2uas([set_id [, sock_pvar]])

These functions can be used from REQUEST_ROUTE, ONREPLY_ROUTE.

1.6.7. start_recording([set_id [, sock_pvar]]) - deprecated,
rtpproxy_start_recording([set_id [, sock_pvar]])
1.6.7. rtpproxy_start_recording([set_id [, sock_pvar]])

This command will send a signal to the RTP-Proxy to record the
RTP stream on the RTP-Proxy.
Expand Down
12 changes: 3 additions & 9 deletions modules/rtpproxy/doc/rtpproxy_admin.xml
View file
Expand Up @@ -39,12 +39,9 @@
weight value than 0) respond. Default weight is 1.
</para>
<para>
Starting with &osips; 1.11, the set_rtp_proxy_set() function has
been removed. The set is now specified for each function. If
absend, the default set 0 is used. Also, engage_rtp_proxy(),
unforce_rtp_proxy() and start_recording() functions have been deprecated
and replaced by rtpproxy_engage(), rtpproxy_unforce() and
rtpproxy_start_recording() respectively.
Starting with &osips; 2.1, engage_rtp_proxy(), unforce_rtp_proxy()
and start_recording() functions have been fully replaced by
rtpproxy_engage(), rtpproxy_unforce() and rtpproxy_start_recording().
</para>
<para>
IMPORTANT: if you use multiple sets, make sure you use the same set for
Expand Down Expand Up @@ -469,7 +466,6 @@ modparam("rtpproxy", "rtpp_notify_socket", "tcp:10.10.10.10:9999")
<title>Exported Functions</title>
<section>
<title>
<function moreinfo="none">engage_rtp_proxy([flags [, ip_address [, set_id [, sock_pvar]]]]) - deprecated</function>,
<function moreinfo="none">rtpproxy_engage([flags [, ip_address [, set_id [, sock_pvar]]]])</function>
</title>

Expand Down Expand Up @@ -678,7 +674,6 @@ onreply_route[2]
</section>
<section>
<title>
<function moreinfo="none">unforce_rtp_proxy([set_id [, sock_pvar]]) - deprecated</function>,
<function moreinfo="none">rtpproxy_unforce([set_id [, sock_pvar]])</function>
</title>
<para>
Expand Down Expand Up @@ -805,7 +800,6 @@ rtpproxy_unforce();
</section>
<section>
<title>
<function moreinfo="none">start_recording([set_id [, sock_pvar]]) - deprecated</function>,
<function moreinfo="none">rtpproxy_start_recording([set_id [, sock_pvar]])</function>
</title>
<para>
Expand Down
71 changes: 0 additions & 71 deletions modules/rtpproxy/rtpproxy.c
View file
Expand Up @@ -275,9 +275,6 @@ static int fixup_stats(void ** param, int param_no);
static int fixup_stream(void ** param, int param_no);
static int fixup_offer_answer(void ** param, int param_no);
static int fixup_two_options(void ** param, int param_no);
static int fixup_unforce_warn(void ** param, int param_no);
static int fixup_engage_warn(void ** param, int param_no);
static int fixup_recording_warn(void ** param, int param_no);
static struct rtpp_set * select_rtpp_set(int id_set);

static int rtpproxy_set_store(modparam_t type, void * val);
Expand Down Expand Up @@ -371,39 +368,6 @@ static event_id_t ei_id = EVI_ERROR;
rw_lock_t *nh_lock=NULL;

static cmd_export_t cmds[] = {
{"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy_f, 0,
fixup_unforce_warn, 0,
REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
{"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy_f, 1,
fixup_unforce_warn, 0,
REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
{"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy_f, 2,
fixup_unforce_warn, 0,
REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
{"engage_rtp_proxy", (cmd_function)engage_rtp_proxy4_f, 0,
fixup_engage_warn, 0,
REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
{"engage_rtp_proxy", (cmd_function)engage_rtp_proxy4_f, 1,
fixup_engage_warn, 0,
REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
{"engage_rtp_proxy", (cmd_function)engage_rtp_proxy4_f, 2,
fixup_engage_warn, 0,
REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
{"engage_rtp_proxy", (cmd_function)engage_rtp_proxy4_f, 3,
fixup_engage_warn, 0,
REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
{"engage_rtp_proxy", (cmd_function)engage_rtp_proxy4_f, 4,
fixup_engage_warn, 0,
REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
{"start_recording", (cmd_function)start_recording_f, 0,
fixup_recording_warn, 0,
REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},
{"start_recording", (cmd_function)start_recording_f, 1,
fixup_recording_warn, 0,
REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},
{"start_recording", (cmd_function)start_recording_f, 2,
fixup_recording_warn, 0,
REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE},
{"rtpproxy_unforce", (cmd_function)unforce_rtp_proxy_f, 0,
0, 0,
REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
Expand Down Expand Up @@ -808,31 +772,6 @@ static int rtpproxy_add_rtpproxy_set( char * rtp_proxies, int set_id)
return -1;
}

static void fixup_deprecated_warn(char *oldf, char *newf)
{
LM_WARN("function %s() is now deprecated - use %s() instead\n", oldf, newf);
}

static int fixup_unforce_warn(void ** param, int param_no)
{
static int warned = 0;
if (!warned) {
fixup_deprecated_warn("unforce_rtp_proxy", "rtpproxy_unforce");
warned = 1;
}
return param_no > 0 ? fixup_two_options(param, param_no) : 0;
}

static int fixup_recording_warn(void ** param, int param_no)
{
static int warned = 0;
if (!warned) {
fixup_deprecated_warn("start_recording", "rtpproxy_start_recording");
warned = 1;
}
return param_no > 0 ? fixup_two_options(param, param_no) : 0;
}

static int fixup_two_options(void ** param, int param_no)
{
if (param_no == 1)
Expand Down Expand Up @@ -960,16 +899,6 @@ static int fixup_stream(void **param, int param_no)
return 0;
}

static int fixup_engage_warn(void ** param, int param_no)
{
static int warned = 0;
if (!warned) {
fixup_deprecated_warn("engage_rtp_proxy", "rtpproxy_engage");
warned = 1;
}
return param_no > 0 ? fixup_engage(param, param_no) : 0;
}

static int fixup_engage(void** param, int param_no)
{
if (param_no < 2 && !dlg_api.create_dlg) {
Expand Down

0 comments on commit 4e09501

Please sign in to comment.