Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: shimaore/ccnq4-opensips
base: 05f93e67e5
...
head fork: shimaore/ccnq4-opensips
compare: 2c611b86b8
Checking mergeability… Don't worry, you can still create the pull request.
  • 7 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
15 common/mediaproxy/dispatcher.ini
@@ -0,0 +1,15 @@
+# start dispatcher configuration
+
+[Dispatcher]
+socket_path = /var/run/mediaproxy/dispatcher.sock
+listen = 127.0.0.1
+listen_management = 127.0.0.1
+;log_level = DEBUG
+;relay_timeout = 5
+;accounting =
+
+[OpenSIPS]
+;socket_path = /var/run/opensips/socket
+;max_connections = 10
+
+# end dispatcher configuration
View
44 common/opensips/fragments/invite-outbound-proxy.cfg
@@ -22,28 +22,6 @@ route[invite_handler]
# For the outbound-proxy, needs to be able to do LCR.
# See http://www.opensips.org/html/docs/modules/1.5.x/drouting.html
- # Attempt to find a local number first.
- # Alternatively, use Carrier ENUM.
- $avp(number) := null;
- if(!cache_fetch("local","number $rU",$avp(number))) {
- if(!avp_db_load("$rU","$avp(number)")) {
- $avp(number) := '{}';
- }
- cache_store("local","number $rU","$avp(number)",${cache_timeout});
- }
-
- $json(dst_number) := $avp(number);
- $avp(number) := null;
-
- if($json(dst_number/inbound_uri)) {
- xlog("L_DBG","-- invite-oubound-proxy -- Using local inbound_uri\n");
- $ru = $json(dst_number/inbound_uri);
- setflag(${flag_trunk_routing});
- t_on_branch("1");
- route(initial_forwarder); # Forward
- return;
- }
-
if use_registrant
$avp(number) := null;
if(!cache_fetch("local","number $fU",$avp(number))) {
@@ -83,6 +61,28 @@ route[invite_handler]
route(lookup_src);
+ # Attempt to find a local number first.
+ # Alternatively, use Carrier ENUM.
+ $avp(number) := null;
+ if(!cache_fetch("local","number $rU",$avp(number))) {
+ if(!avp_db_load("$rU","$avp(number)")) {
+ $avp(number) := '{}';
+ }
+ cache_store("local","number $rU","$avp(number)",${cache_timeout});
+ }
+
+ $json(dst_number) := $avp(number);
+ $avp(number) := null;
+
+ if($json(dst_number/inbound_uri)) {
+ xlog("L_DBG","-- invite-oubound-proxy -- Using local inbound_uri\n");
+ $ru = $json(dst_number/inbound_uri);
+ setflag(${flag_trunk_routing});
+ t_on_branch("1");
+ route(initial_forwarder); # Forward
+ return;
+ }
+
# LCR
route(invite_trunk_drouting);
View
2  debian/ccnq3-munin-opensips-latest.install
@@ -1,2 +1,2 @@
common/munin/plugins/opensips* /usr/share/munin/plugins
-common/munin/plugin-conf.d/ccnq3-munin-opensips /etc/munin/plugin-conf.d
+common/munin/plugin-conf.d/ccnq3-munin-opensips-latest /etc/munin/plugin-conf.d
View
3  debian/ccnq3-opensips-latest.install
@@ -1,2 +1,5 @@
+applications/opensips /opt/ccnq3/src/applications
+applications/emergency /opt/ccnq3/src/applications
+applications/registrant /opt/ccnq3/src/applications
common/opensips /opt/ccnq3/src/common
common/mediaproxy/dispatcher.ini /opt/ccnq3/src/common/mediaproxy
View
5 debian/control
@@ -3,6 +3,8 @@ Maintainer: Stephane Alnet (Packaging) <stephane@shimaore.net>
Package: ccnq3-opensips-latest
Provides: ccnq3-opensips
+Replaces: ccnq3-opensips
+Conflicts: ccnq3-opensips-ga
Architecture: all
Depends: ccnq3,
opensips (= ${opensips:Version}),
@@ -18,8 +20,9 @@ Description: OpenSIPS dependencies for CCNQ3, development branch
Package: ccnq3-munin-opensips-latest
Provides: ccnq3-munin-opensips
+Replaces: ccnq3-munin-opensips
Architecture: all
-Depends: munin-node, ccnq3-opensips (= ${binary:Version}),
+Depends: munin-node, ccnq3-opensips-latest (= ${binary:Version}),
bash
Description: munin modules for ccnq3-opensips
Provides the opensips_dialogs munin plugin.
View
1  debian/rules
@@ -4,6 +4,7 @@
override_dh_gencontrol:
dh_gencontrol -- \
+ -Vmediaproxy:Version="2.5.2-5~shimaore" \
-Vopensips:Version="1.11.0~shimaore-5"
override_dh_installinit:

No commit comments for this range

Something went wrong with that request. Please try again.