Skip to content

Commit

Permalink
obsolete pdt module
Browse files Browse the repository at this point in the history
  • Loading branch information
razvancrainea committed Mar 19, 2015
1 parent ad6ef2c commit ab93408
Show file tree
Hide file tree
Showing 42 changed files with 8 additions and 96 deletions.
6 changes: 0 additions & 6 deletions README-MODULES
Expand Up @@ -366,12 +366,6 @@ Maturity: beta
Depends on: rr
Purpose: PATH support for complex routing

Name: pdt
Use: regular
Maturity: stable
Depends on: database
Purpose: Prefix to Domain translation

Name: peering
Use: experimental
Maturity: alpha
Expand Down
1 change: 0 additions & 1 deletion doc/doxygen/opensips-doxygen
Expand Up @@ -522,7 +522,6 @@ INPUT = ./ \
modules/options \
modules/osp \
modules/path \
modules/pdt \
modules/perl \
modules/perlvdb \
modules/permissions \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions packaging/fedora/opensips.spec
Expand Up @@ -961,7 +961,6 @@ chown -R %{name}:%{name} %{_sysconfdir}/%{name}
%{_libdir}/opensips/modules/rtpproxy.so
%{_libdir}/opensips/modules/options.so
%{_libdir}/opensips/modules/path.so
%{_libdir}/opensips/modules/pdt.so
%{_libdir}/opensips/modules/permissions.so
%{_libdir}/opensips/modules/pike.so
%{_libdir}/opensips/modules/qos.so
Expand Down Expand Up @@ -1027,7 +1026,6 @@ chown -R %{name}:%{name} %{_sysconfdir}/%{name}
%doc docdir/README.nathelper
%doc docdir/README.options
%doc docdir/README.path
%doc docdir/README.pdt
%doc docdir/README.permissions
%doc docdir/README.pike
%doc docdir/README.qos
Expand Down
2 changes: 1 addition & 1 deletion packaging/freebsd/Makefile
Expand Up @@ -37,7 +37,7 @@ MODULES= acc alias_db auth auth_db auth_diameter avpops benchmark \
cfgutils dbtext dialog dispatcher diversion domain \
domainpolicy enum exec flatstore gflags group imc \
mangler maxfwd mediaproxy mi_datagram mi_fifo msilo nathelper \
options path pdt permissions pike registrar rr seas \
options path permissions pike registrar rr seas \
siptrace sl sms speeddial sst statistics textops tm uac \
uac_redirect uri uri_db usrloc xlog

Expand Down
2 changes: 0 additions & 2 deletions packaging/netbsd/PLIST
Expand Up @@ -43,7 +43,6 @@ lib/opensips/modules/nathelper.so
lib/opensips/modules/nat_traversal.so
lib/opensips/modules/options.so
lib/opensips/modules/path.so
lib/opensips/modules/pdt.so
lib/opensips/modules/permissions.so
lib/opensips/modules/pike.so
lib/opensips/modules/ratelimit.so
Expand Down Expand Up @@ -116,7 +115,6 @@ share/doc/opensips/README.nathelper
share/doc/opensips/README.nat_traversal
share/doc/opensips/README.options
share/doc/opensips/README.path
share/doc/opensips/README.pdt
share/doc/opensips/README.permissions
share/doc/opensips/README.pike
share/doc/opensips/README.ratelimit
Expand Down
2 changes: 0 additions & 2 deletions packaging/openbsd/pkg/PLIST
Expand Up @@ -43,7 +43,6 @@ lib/opensips/modules/nathelper.so
lib/opensips/modules/nat_traversal.so
lib/opensips/modules/options.so
lib/opensips/modules/path.so
lib/opensips/modules/pdt.so
lib/opensips/modules/permissions.so
lib/opensips/modules/pike.so
lib/opensips/modules/ratelimit.so
Expand Down Expand Up @@ -116,7 +115,6 @@ share/doc/opensips/README.nathelper
share/doc/opensips/README.nat_traversal
share/doc/opensips/README.options
share/doc/opensips/README.path
share/doc/opensips/README.pdt
share/doc/opensips/README.permissions
share/doc/opensips/README.pike
share/doc/opensips/README.ratelimit
Expand Down
2 changes: 0 additions & 2 deletions packaging/rpm/opensips.spec.CentOS
Expand Up @@ -470,7 +470,6 @@ fi
%doc %{_docdir}/opensips/README.nathelper
%doc %{_docdir}/opensips/README.options
%doc %{_docdir}/opensips/README.path
%doc %{_docdir}/opensips/README.pdt
%doc %{_docdir}/opensips/README.permissions
%doc %{_docdir}/opensips/README.pike
%doc %{_docdir}/opensips/README.qos
Expand Down Expand Up @@ -555,7 +554,6 @@ fi
%{_libdir}/opensips/modules/nathelper.so
%{_libdir}/opensips/modules/options.so
%{_libdir}/opensips/modules/path.so
%{_libdir}/opensips/modules/pdt.so
%{_libdir}/opensips/modules/permissions.so
%{_libdir}/opensips/modules/pike.so
%{_libdir}/opensips/modules/python.so
Expand Down
2 changes: 0 additions & 2 deletions packaging/rpm/opensips.spec.SuSE
Expand Up @@ -263,7 +263,6 @@ sbin/insserv etc/init.d/
%doc %{_docdir}/opensips/README.nathelper
%doc %{_docdir}/opensips/README.options
%doc %{_docdir}/opensips/README.path
%doc %{_docdir}/opensips/README.pdt
%doc %{_docdir}/opensips/README.permissions
%doc %{_docdir}/opensips/README.pike
%doc %{_docdir}/opensips/README.qos
Expand Down Expand Up @@ -332,7 +331,6 @@ sbin/insserv etc/init.d/
%{_libdir}/opensips/modules/nathelper.so
%{_libdir}/opensips/modules/options.so
%{_libdir}/opensips/modules/path.so
%{_libdir}/opensips/modules/pdt.so
%{_libdir}/opensips/modules/permissions.so
%{_libdir}/opensips/modules/pike.so
%{_libdir}/opensips/modules/qos.so
Expand Down
3 changes: 0 additions & 3 deletions packaging/solaris/base-Prototype
Expand Up @@ -27,7 +27,6 @@ f none /opt/opensips/dbtext/opensips/imc_rooms 0644 root root
f none /opt/opensips/dbtext/opensips/load_balancer 0644 root root
f none /opt/opensips/dbtext/opensips/location 0644 root root
f none /opt/opensips/dbtext/opensips/missed_calls 0644 root root
f none /opt/opensips/dbtext/opensips/pdt 0644 root root
f none /opt/opensips/dbtext/opensips/nh_sockets 0644 root root
f none /opt/opensips/dbtext/opensips/presentity 0644 root root
f none /opt/opensips/dbtext/opensips/pua 0644 root root
Expand Down Expand Up @@ -94,7 +93,6 @@ f none /opt/opensips/lib64/opensips/modules/nathelper.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/nat_traversal.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/options.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/path.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/pdt.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/pike.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/permissions.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/presence.so 0755 root root
Expand Down Expand Up @@ -189,7 +187,6 @@ f none /opt/opensips/README.nathelper 0644 root root
f none /opt/opensips/README.nat_traversal 0644 root root
f none /opt/opensips/README.options 0644 root root
f none /opt/opensips/README.path 0644 root root
f none /opt/opensips/README.pdt 0644 root root
f none /opt/opensips/README.permissions 0644 root root
f none /opt/opensips/README.pike 0644 root root
f none /opt/opensips/README.presence 0644 root root
Expand Down
1 change: 0 additions & 1 deletion packaging/solaris/berkeley-Prototype
Expand Up @@ -28,7 +28,6 @@ f none /opt/opensips/db_berkeley/opensips/imc_rooms 0644 root root
f none /opt/opensips/db_berkeley/opensips/load_balancer 0644 root root
f none /opt/opensips/db_berkeley/opensips/location 0644 root root
f none /opt/opensips/db_berkeley/opensips/missed_calls 0644 root root
f none /opt/opensips/db_berkeley/opensips/pdt 0644 root root
f none /opt/opensips/db_berkeley/opensips/nh_sockets 0644 root root
f none /opt/opensips/db_berkeley/opensips/presentity 0644 root root
f none /opt/opensips/db_berkeley/opensips/pua 0644 root root
Expand Down
1 change: 0 additions & 1 deletion packaging/solaris/mysql-Prototype
Expand Up @@ -30,7 +30,6 @@ f none /opt/opensips/mysql/imc-create.sql 0644 root root
f none /opt/opensips/mysql/load_balancer-create.sql 0644 root root
f none /opt/opensips/mysql/msilo-create.sql 0644 root root
f none /opt/opensips/mysql/nathelper-create.sql 0644 root root
f none /opt/opensips/mysql/pdt-create.sql 0644 root root
f none /opt/opensips/mysql/permissions-create.sql 0644 root root
f none /opt/opensips/mysql/presence-create.sql 0644 root root
f none /opt/opensips/mysql/registrar-create.sql 0644 root root
Expand Down
1 change: 0 additions & 1 deletion packaging/solaris/pgsql-Prototype
Expand Up @@ -27,7 +27,6 @@ f none /opt/opensips/postgres/imc-create.sql 0644 root root
f none /opt/opensips/postgres/load_balancer-create.sql 0644 root root
f none /opt/opensips/postgres/msilo-create.sql 0644 root root
f none /opt/opensips/postgres/nathelper-create.sql 0644 root root
f none /opt/opensips/postgres/pdt-create.sql 0644 root root
f none /opt/opensips/postgres/permissions-create.sql 0644 root root
f none /opt/opensips/postgres/presence-create.sql 0644 root root
f none /opt/opensips/postgres/registrar-create.sql 0644 root root
Expand Down
2 changes: 0 additions & 2 deletions packaging/solaris/prototype
Expand Up @@ -38,7 +38,6 @@ f none lib/opensips/modules/mysql.so 0755 bin bin
f none lib/opensips/modules/nathelper.so 0755 bin bin
f none lib/opensips/modules/options.so 0755 bin bin
f none lib/opensips/modules/path.so 0755 bin bin
f none lib/opensips/modules/pdt.so 0755 bin bin
f none lib/opensips/modules/permissions.so 0755 bin bin
f none lib/opensips/modules/pike.so 0755 bin bin
f none lib/opensips/modules/registrar.so 0755 bin bin
Expand Down Expand Up @@ -100,7 +99,6 @@ f none doc/opensips/README.mysql 0644 bin bin
f none doc/opensips/README.nathelper 0644 bin bin
f none doc/opensips/README.options 0644 bin bin
f none doc/opensips/README.path 0644 bin bin
f none doc/opensips/README.pdt 0644 bin bin
f none doc/opensips/README.permissions 0644 bin bin
f none doc/opensips/README.pike 0644 bin bin
f none doc/opensips/README.registrar 0644 bin bin
Expand Down
3 changes: 0 additions & 3 deletions packaging/solaris/tls-Prototype
Expand Up @@ -27,7 +27,6 @@ f none /opt/opensips/dbtext/opensips/imc_rooms 0644 root root
f none /opt/opensips/dbtext/opensips/load_balancer 0644 root root
f none /opt/opensips/dbtext/opensips/location 0644 root root
f none /opt/opensips/dbtext/opensips/missed_calls 0644 root root
f none /opt/opensips/dbtext/opensips/pdt 0644 root root
f none /opt/opensips/dbtext/opensips/nh_sockets 0644 root root
f none /opt/opensips/dbtext/opensips/presentity 0644 root root
f none /opt/opensips/dbtext/opensips/pua 0644 root root
Expand Down Expand Up @@ -111,7 +110,6 @@ f none /opt/opensips/lib64/opensips/modules/nathelper.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/nat_traversal.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/options.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/path.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/pdt.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/permissions.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/pike.so 0755 root root
f none /opt/opensips/lib64/opensips/modules/presence.so 0755 root root
Expand Down Expand Up @@ -206,7 +204,6 @@ f none /opt/opensips/README.nathelper 0644 root root
f none /opt/opensips/README.nat_traversal 0644 root root
f none /opt/opensips/README.options 0644 root root
f none /opt/opensips/README.path 0644 root root
f none /opt/opensips/README.pdt 0644 root root
f none /opt/opensips/README.permissions 0644 root root
f none /opt/opensips/README.pike 0644 root root
f none /opt/opensips/README.presence 0644 root root
Expand Down
2 changes: 1 addition & 1 deletion scripts/opensipsctlrc
Expand Up @@ -89,7 +89,7 @@

# opensips standard modules
# STANDARD_MODULES="standard acc domain group permissions registrar usrloc
# msilo alias_db uri_db speeddial avpops auth_db pdt dialog
# msilo alias_db uri_db speeddial avpops auth_db dialog
# dispatcher dialplan drouting nathelper load_balancer"

# opensips extra modules
Expand Down
4 changes: 2 additions & 2 deletions scripts/opensipsdbctl.base
Expand Up @@ -29,7 +29,7 @@ INSTALL_PRESENCE_TABLES=${INSTALL_PRESENCE_TABLES:-ask}

# Used by dbtext and db_berkeley to define tables to be created, used by
# postgres to do the grants
STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain grp uri speed_dial pdt subscriber location re_grp address address missed_calls usr_preferences aliases silo dialog dispatcher dialplan dr_gateways dr_rules dr_groups rtpproxy_sockets load_balancer}
STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain grp uri speed_dial subscriber location re_grp address address missed_calls usr_preferences aliases silo dialog dispatcher dialplan dr_gateways dr_rules dr_groups rtpproxy_sockets load_balancer}
EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute route_tree carrierfailureroute userblacklist globalblacklist cachedb_sql registrant call_center fraud_detection}
PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap pua rls_presentity rls_watchers}

Expand Down Expand Up @@ -60,7 +60,7 @@ GREP=${GREP:-grep}
SED=${SED:-sed}

# define what modules should be installed
STANDARD_MODULES=${STANDARD_MODULES:-standard acc domain group permissions registrar usrloc msilo alias_db uri_db rtpproxy speeddial avpops auth_db pdt dialog dispatcher dialplan drouting load_balancer }
STANDARD_MODULES=${STANDARD_MODULES:-standard acc domain group permissions registrar usrloc msilo alias_db uri_db rtpproxy speeddial avpops auth_db dialog dispatcher dialplan drouting load_balancer }
EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute userblacklist b2b cachedb_sql registrant call_center fraud_detection}

############################################################
Expand Down
6 changes: 0 additions & 6 deletions scripts/opensipsdbctl.mysql
Expand Up @@ -400,12 +400,6 @@ migrate_table ${dst_db}.silo \
${src_db}.silo \
"?id,?src_addr,?dst_addr,?username,?domain,?inc_time,?exp_time,?snd_time,?ctype,?body"

## PDT module
migrate_table ${dst_db}.pdt \
"id,sdomain,prefix,domain" \
${src_db}.pdt \
"?id,?sdomain,?prefix,?domain"

## PERMISSION module
migrate_table ${dst_db}.address \
"id,grp,ip,mask,port,proto,pattern,context_info" \
Expand Down
1 change: 0 additions & 1 deletion scripts/opensipsdbctl.pgsql
Expand Up @@ -14,7 +14,6 @@
# split GRANTs for SERWeb tables so that it is only executed
# if SERWeb tables are created
# added GRANTs for re_grp table
# added CREATE pdt table (from PDT module)
# corrected comments to indicate Postgres as opposed to MySQL
# made last_modified/created stamps consistent to now() using
# local TIMESTAMP
Expand Down
7 changes: 2 additions & 5 deletions scripts/osipsconsole
Expand Up @@ -122,7 +122,7 @@ my $ALIAS_EXISTS = 0;
#
my @STANDARD_TABLES = ('version', 'acc', 'dbaliases',
'domain', 'grp', 'uri', 'speed_dial',
'gw', 'pdt', 'subscriber', 'location',
'gw', 'subscriber', 'location',
're_grp', 'address', 'missed_calls',
'usr_preferences', 'aliases', 'silo',
'dialog', 'dispatcher', 'dialplan',
Expand All @@ -131,7 +131,7 @@ my @STANDARD_TABLES = ('version', 'acc', 'dbaliases',

my @STANDARD_MODULES = ('standard', 'acc', 'domain', 'group',
'permissions', 'registrar', 'usrloc', 'msilo', 'alias_db', 'uri_db',
'speeddial', 'avpops', 'auth_db', 'pdt', 'dialog', 'dispatcher',
'speeddial', 'avpops', 'auth_db', 'dialog', 'dispatcher',
'dialplan','drouting','rtpproxy','load_balancer' );

my @EXTRA_TABLES = ('imc_members', 'imc_rooms', 'cpl', 'sip_trace',
Expand Down Expand Up @@ -6285,9 +6285,6 @@ sub mysql_migrate_db() { # 2 parameters (src_db, dst_db)
### gw
&mysql_migrate_table( $dst_db . ".gw", "id,gw_name,grp_id,ip_addr,port,uri_scheme,transport,strip,tag,flags", $src_db . ".gw", "?id,?gw_name,?grp_id,?ip_addr,?port,?uri_scheme,?transport,?strip,?tag,?flags" );

### pdt
&mysql_migrate_table( $dst_db. ".pdt", "id,sdomain,prefix,domain", $src_db . ".pdt", "?id,?sdomain,?prefix,?domain" );

### subscriber
&mysql_migrate_table( $dst_db . ".subscriber", "id,username,domain,password,email_address,ha1,ha1b,rpid", $src_db . ".subscriber", "?id,?username,?domain,?password,?email_address,?ha1,?ha1b,?rpid" );

Expand Down
2 changes: 1 addition & 1 deletion scripts/osipsconsolerc
Expand Up @@ -60,7 +60,7 @@

# opensips standard modules
# STANDARD_MODULES="standard acc domain group permissions registrar usrloc msilo
# alias_db uri_db speeddial avpops auth_db pdt dialog dispatcher
# alias_db uri_db speeddial avpops auth_db dialog dispatcher
# dialplan drouting nathelper load_balancer"

# opensips extra modules
Expand Down
50 changes: 0 additions & 50 deletions scripts/pi_http/pi_framework.xml
Expand Up @@ -582,15 +582,6 @@
<column><field>ctype</field><type>DB_STR</type></column>
<column><field>body</field><type>DB_BLOB</type></column>
</db_table>
<!-- Declaration of pdt table-->
<db_table id="pdt">
<table_name>pdt</table_name>
<db_url_id>mysql</db_url_id>
<column><field>id</field><type>DB_INT</type></column>
<column><field>sdomain</field><type>DB_STR</type></column>
<column><field>prefix</field><type>DB_STR</type></column>
<column><field>domain</field><type>DB_STR</type></column>
</db_table>
<!-- Declaration of address table-->
<db_table id="address">
<table_name>address</table_name>
Expand Down Expand Up @@ -3068,47 +3059,6 @@
</clause_cols>
</cmd>
</mod>
<!-- pdt provisionning -->
<mod><mod_name>pdt</mod_name>
<cmd><cmd_name>show</cmd_name>
<db_table_id>pdt</db_table_id>
<cmd_type>DB_QUERY</cmd_type>
<query_cols>
<col><field>id</field><link_cmd>update</link_cmd></col>
<col><field>sdomain</field></col>
<col><field>prefix</field></col>
<col><field>domain</field></col>
</query_cols>
</cmd>
<cmd><cmd_name>add</cmd_name>
<db_table_id>pdt</db_table_id>
<cmd_type>DB_INSERT</cmd_type>
<query_cols>
<col><field>sdomain</field></col>
<col><field>prefix</field></col>
<col><field>domain</field></col>
</query_cols>
</cmd>
<cmd><cmd_name>update</cmd_name>
<db_table_id>pdt</db_table_id>
<cmd_type>DB_UPDATE</cmd_type>
<clause_cols>
<col><field>id</field><operator>=</operator></col>
</clause_cols>
<query_cols>
<col><field>sdomain</field></col>
<col><field>prefix</field></col>
<col><field>domain</field></col>
</query_cols>
</cmd>
<cmd><cmd_name>delete</cmd_name>
<db_table_id>pdt</db_table_id>
<cmd_type>DB_DELETE</cmd_type>
<clause_cols>
<col><field>id</field><operator>=</operator></col>
</clause_cols>
</cmd>
</mod>
<!-- address provisionning -->
<mod><mod_name>address</mod_name>
<cmd><cmd_name>show</cmd_name>
Expand Down
2 changes: 1 addition & 1 deletion test/include/common
@@ -1 +1 @@
DB_ALL_MOD="acc|alias_db|auth_db|dialog|dialplan|dispatcher|domain|domainpolicy|group|imc|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt|userblacklist"
DB_ALL_MOD="acc|alias_db|auth_db|dialog|dialplan|dispatcher|domain|domainpolicy|group|imc|msilo|siptrace|speeddial|uri_db|usrloc|permissions|userblacklist"

0 comments on commit ab93408

Please sign in to comment.