Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove SIPre plugin from the repo #1894

Merged
merged 1 commit into from
Dec 12, 2019
Merged

Remove SIPre plugin from the repo #1894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,16 +447,6 @@ conf_DATA += conf/janus.plugin.sip.jcfg.sample
EXTRA_DIST += conf/janus.plugin.sip.jcfg.sample
endif

if ENABLE_PLUGIN_SIPRE
plugin_LTLIBRARIES += plugins/libjanus_sipre.la
plugins_libjanus_sipre_la_SOURCES = plugins/janus_sipre.c
plugins_libjanus_sipre_la_CFLAGS = $(plugins_cflags) $(LIBRE_CFLAGS)
plugins_libjanus_sipre_la_LDFLAGS = $(plugins_ldflags) $(LIBRE_LDFLAGS) $(LIBRE_LIBS)
plugins_libjanus_sipre_la_LIBADD = $(plugins_libadd) $(LIBRE_LIBADD)
conf_DATA += conf/janus.plugin.sipre.jcfg.sample
EXTRA_DIST += conf/janus.plugin.sipre.jcfg.sample
endif

if ENABLE_PLUGIN_NOSIP
plugin_LTLIBRARIES += plugins/libjanus_nosip.la
plugins_libjanus_nosip_la_SOURCES = plugins/janus_nosip.c
Expand Down
21 changes: 0 additions & 21 deletions conf/janus.plugin.sipre.jcfg.sample
View file
Open in desktop

This file was deleted.

52 changes: 2 additions & 50 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,6 @@ AC_ARG_ENABLE([all-plugins],
[enable_plugin_recordplay=no])
AS_IF([test "x$enable_plugin_sip" != "xyes"],
[enable_plugin_sip=no])
AS_IF([test "x$enable_plugin_sipre" != "xyes"],
[enable_plugin_sipre=no])
AS_IF([test "x$enable_plugin_nosip" != "xyes"],
[enable_plugin_nosip=no])
AS_IF([test "x$enable_plugin_streaming" != "xyes"],
Expand Down Expand Up @@ -711,13 +709,6 @@ AC_ARG_ENABLE([plugin-sip],
[enable_plugin_sip=no])],
[enable_plugin_sip=maybe])

AC_ARG_ENABLE([plugin-sipre],
[AS_HELP_STRING([--disable-plugin-sipre],
[Disable sipre plugin])],
[AS_IF([test "x$enable_plugin_sipre" != "xyes"],
[enable_plugin_sipre=no])],
[enable_plugin_sipre=maybe])

AC_ARG_ENABLE([plugin-nosip],
[AS_HELP_STRING([--disable-plugin-nosip],
[Disable nosip plugin])],
Expand Down Expand Up @@ -773,41 +764,6 @@ PKG_CHECK_MODULES([SOFIA],
AC_SUBST([SOFIA_CFLAGS])
AC_SUBST([SOFIA_LIBS])

PKG_CHECK_MODULES([LIBRE],
[libre >= 0.5.7],
[
AS_IF([test "x$enable_plugin_sipre" = "xmaybe"],
[
enable_plugin_sipre=yes
AC_DEFINE(HAVE_LIBRE_SIPREGNEWAPI)
AC_CHECK_LIB([re],
[sip_set_trace],
[AC_DEFINE(HAVE_LIBRE_SIPTRACE)],
[AC_MSG_NOTICE([libre version does not have sip_set_trace])]
)
])
],
[PKG_CHECK_MODULES([LIBRE],
[libre],
[
AS_IF([test "x$enable_plugin_sipre" = "xmaybe"],
[
enable_plugin_sipre=yes
AC_CHECK_LIB([re],
[sip_set_trace],
[AC_DEFINE(HAVE_LIBRE_SIPTRACE)],
[AC_MSG_NOTICE([libre version does not have sip_set_trace])]
)
])
],
[
AS_IF([test "x$enable_plugin_sipre" = "xyes"],
[AC_MSG_ERROR([libre not found. See README.md for installation instructions or use --disable-plugin-sip])])
])
])
AC_SUBST([SOFIA_CFLAGS])
AC_SUBST([SOFIA_LIBS])

PKG_CHECK_MODULES([OPUS],
[opus],
[
Expand Down Expand Up @@ -860,7 +816,6 @@ AM_CONDITIONAL([ENABLE_PLUGIN_ECHOTEST], [test "x$enable_plugin_echotest" = "xye
AM_CONDITIONAL([ENABLE_PLUGIN_LUA], [test "x$enable_plugin_lua" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_RECORDPLAY], [test "x$enable_plugin_recordplay" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_SIP], [test "x$enable_plugin_sip" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_SIPRE], [test "x$enable_plugin_sipre" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_NOSIP], [test "x$enable_plugin_nosip" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_STREAMING], [test "x$enable_plugin_streaming" = "xyes"])
AM_CONDITIONAL([ENABLE_PLUGIN_VIDEOCALL], [test "x$enable_plugin_videocall" = "xyes"])
Expand Down Expand Up @@ -1043,11 +998,8 @@ AM_COND_IF([ENABLE_PLUGIN_VIDEOCALL],
[echo " Video Call: yes"],
[echo " Video Call: no"])
AM_COND_IF([ENABLE_PLUGIN_SIP],
[echo " SIP Gateway (Sofia): yes"],
[echo " SIP Gateway (Sofia): no"])
AM_COND_IF([ENABLE_PLUGIN_SIPRE],
[echo " SIP Gateway (libre): yes"],
[echo " SIP Gateway (libre): no"])
[echo " SIP Gateway: yes"],
[echo " SIP Gateway: no"])
AM_COND_IF([ENABLE_PLUGIN_NOSIP],
[echo " NoSIP (RTP Bridge): yes"],
[echo " NoSIP (RTP Bridge): no"])
Expand Down
8 changes: 2 additions & 6 deletions html/demos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<link rel="stylesheet" href="css/demo.css" type="text/css"/>
</head>
<body>

<a href="https://github.com/meetecho/janus-gateway"><img style="position: absolute; top: 0; left: 0; border: 0; z-index: 1001;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_darkblue_121621.png" alt="Fork me on GitHub"></a>

<nav class="navbar navbar-default navbar-static-top">
Expand Down Expand Up @@ -49,7 +49,7 @@ <h1>Janus WebRTC Server: Demo Tests</h1>
<td>A Video Call demo, a bit like AppRTC but with media passing through Janus.</td>
</tr>
<tr>
<td><a href="siptest.html">SIP Gateway (Sofia)</a></td>
<td><a href="siptest.html">SIP Gateway</a></td>
<td>A SIP Gateway demo, allowing you to register at a SIP server and start/receive calls.</td>
</tr>
<tr>
Expand Down Expand Up @@ -81,10 +81,6 @@ <h1>Janus WebRTC Server: Demo Tests</h1>
<tr>
<td colspan=2><h3>Other legacy demos</h3></td>
</tr>
<tr>
<td><a href="sipretest.html">SIP Gateway (libre)</a></td>
<td>Same as the SIP demo above, but using the libre-based plugin instead of the Sofia-based one.</td>
</tr>
<tr>
<td><a href="nosiptest.html">NoSIP (SDP/RTP)</a></td>
<td>A legacy interop demo (e.g., with a SIP peer) where signalling is up to the application.</td>
Expand Down
1 change: 0 additions & 1 deletion html/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<li><a href="recordplaytest.html">Recorder/Playout</a></li>
<li><a href="screensharingtest.html">Screen Sharing</a></li>
<li class="divider"></li>
<li><a href="sipretest.html">SIP Gateway (libre)</a></li>
<li><a href="nosiptest.html">NoSIP (SDP/RTP)</a></li>
<li class="divider"></li>
<li><a href="devicetest.html">Device Selection</a></li>
Expand Down
144 changes: 0 additions & 144 deletions html/sipretest.html
View file
Open in desktop

This file was deleted.

Loading