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

Jump to bottom

Renaming userblacklist to userblocklist #2544

Merged
merged 5 commits into from Nov 10, 2020
Merged

Renaming userblacklist to userblocklist #2544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15dd032
userblocklist: renaming userblacklist module
lbalaceanu Nov 6, 2020
3339227
src/lib/srdb1/schema: renaming userblacklist to userblocklist
lbalaceanu Nov 6, 2020
879ca70
src/lib/srdb1/schema: replacing denomination to blocklist/allowlist
lbalaceanu Nov 6, 2020
719c298
kamctl: rename userblacklist to userblocklist
lbalaceanu Nov 9, 2020
b1af4ec
kamctl: regenerated db schema for userblocklist
lbalaceanu Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Makefile.groups
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \
db_cluster dialog dispatcher domain drouting group \
htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions \
pipelimit prefix_route registrar sipcapture siptrace speeddial \
sqlops uac uri_db userblacklist usrloc secfilter
sqlops uac uri_db userblocklist usrloc secfilter


# - common modules depending on database, using UID db schema
Expand Down
18 changes: 9 additions & 9 deletions src/lib/srdb1/schema/globalblacklist.xml → src/lib/srdb1/schema/globalblocklist.xml
View file
Open in desktop
Expand Up @@ -7,16 +7,16 @@

]>

<table id="globalblacklist" xmlns:db="http://docbook.org/ns/docbook">
<name>globalblacklist</name>
<table id="globalblocklist" xmlns:db="http://docbook.org/ns/docbook">
<name>globalblocklist</name>
<version>1</version>
<type db="mysql">&MYSQL_TABLE_TYPE;</type>
<description>
<db:para>This table is used by the userblacklist module for the global
blacklists. More information is available at:
<db:para>This table is used by the userblocklist module for the global
blocklists. More information is available at:
<itemizedlist>
<listitem>
<ulink url="&KAMAILIO_MOD_DOC;userblacklist.html">&KAMAILIO_MOD_DOC;userblacklist.html</ulink>.
<ulink url="&KAMAILIO_MOD_DOC;userblocklist.html">&KAMAILIO_MOD_DOC;userblocklist.html</ulink>.
</listitem>
</itemizedlist>
</db:para>
Expand All @@ -37,15 +37,15 @@
<type>string</type>
<size>&user_len;</size>
<default/>
<description>The prefix that is matched for the blacklist.</description>
<description>The prefix that is matched for the blocklist.</description>
</column>

<column>
<name>whitelist</name>
<name>allowlist</name>
<type>char</type>
<size>1</size>
<default>0</default>
<description>Specify if this a blacklist (0) or a whitelist (1) entry.</description>
<description>Specify if this a blocklist (0) or a allowlist (1) entry.</description>
</column>

<column>
Expand All @@ -58,7 +58,7 @@
</column>

<index>
<name>globalblacklist_idx</name>
<name>globalblocklist_idx</name>
<colref linkend="prefix"/>
</index>
</table>
4 changes: 2 additions & 2 deletions ...b/srdb1/schema/kamailio-userblacklist.xml → ...b/srdb1/schema/kamailio-userblocklist.xml
View file
Open in desktop
Expand Up @@ -9,6 +9,6 @@

<database xmlns:xi="http://www.w3.org/2001/XInclude">
<name>USERBLACKLIST Module</name>
<xi:include href="userblacklist.xml"/>
<xi:include href="globalblacklist.xml"/>
<xi:include href="userblocklist.xml"/>
<xi:include href="globalblocklist.xml"/>
</database>
22 changes: 11 additions & 11 deletions src/lib/srdb1/schema/userblacklist.xml → src/lib/srdb1/schema/userblocklist.xml
View file
Open in desktop
Expand Up @@ -7,17 +7,17 @@

]>

<table id="userblacklist" xmlns:db="http://docbook.org/ns/docbook">
<name>userblacklist</name>
<table id="userblocklist" xmlns:db="http://docbook.org/ns/docbook">
<name>userblocklist</name>
<version>1</version>
<type db="mysql">&MYSQL_TABLE_TYPE;</type>
<description>
<db:para>
This table is used by the userblacklist module for the user specific
blacklists. More information is available at:
This table is used by the userblocklist module for the user specific
blocklists. More information is available at:
<itemizedlist>
<listitem>
<ulink url="&KAMAILIO_MOD_DOC;userblacklist.html">&KAMAILIO_MOD_DOC;userblacklist.html</ulink>.
<ulink url="&KAMAILIO_MOD_DOC;userblocklist.html">&KAMAILIO_MOD_DOC;userblocklist.html</ulink>.
</listitem>
</itemizedlist>
</db:para>
Expand All @@ -38,35 +38,35 @@
<type>string</type>
<size>&user_len;</size>
<default/>
<description>The user that is used for the blacklist lookup.</description>
<description>The user that is used for the blocklist lookup.</description>
</column>

<column id="domain">
<name>domain</name>
<type>string</type>
<size>&domain_len;</size>
<default/>
<description>The domain that is used for the blacklist lookup.</description>
<description>The domain that is used for the blocklist lookup.</description>
</column>

<column id="prefix">
<name>prefix</name>
<type>string</type>
<size>&user_len;</size>
<default/>
<description>The prefix that is matched for the blacklist.</description>
<description>The prefix that is matched for the blocklist.</description>
</column>

<column>
<name>whitelist</name>
<name>allowlist</name>
<type>char</type>
<size>1</size>
<default>0</default>
<description>Specify if this a blacklist (0) or a whitelist (1) entry.</description>
<description>Specify if this a blocklist (0) or a allowlist (1) entry.</description>
</column>

<index>
<name>userblacklist_idx</name>
<name>userblocklist_idx</name>
<colref linkend="username"/>
<colref linkend="domain"/>
<colref linkend="prefix"/>
Expand Down
116 changes: 0 additions & 116 deletions src/modules/userblacklist/db_userblacklist.c
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions src/modules/userblacklist/db_userblacklist.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/modules/userblacklist/Makefile → src/modules/userblocklist/Makefile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

include ../../Makefile.defs
auto_gen=
NAME=userblacklist.so
NAME=userblocklist.so
LIBS=

SERLIBPATH=../../lib
Expand Down