Module: sip-router Branch: master Commit: a5daf1797ff4edbb456d0d0b70138ce422d65d86 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5daf17… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Fri Dec 21 18:42:26 2012 +0100 modules_s/avp_db: renamed to uid_avp_db --- modules_s/{avp_db => uid_avp_db}/Makefile | 2 +- modules_s/{avp_db => uid_avp_db}/README | 52 ++++++++++---------- modules_s/{avp_db => uid_avp_db}/avp_db.xml | 0 modules_s/{avp_db => uid_avp_db}/doc/Makefile | 2 +- .../{avp_db => uid_avp_db}/doc/avp_dialogs.cfg | 0 modules_s/{avp_db => uid_avp_db}/doc/fifo.xml | 0 modules_s/{avp_db => uid_avp_db}/doc/functions.xml | 0 modules_s/{avp_db => uid_avp_db}/doc/params.xml | 0 .../avp_db.xml => uid_avp_db/doc/uid_avp_db.xml} | 2 +- modules_s/{avp_db => uid_avp_db}/extra_attrs.c | 2 +- modules_s/{avp_db => uid_avp_db}/extra_attrs.h | 0 .../{avp_db/avp_db.c => uid_avp_db/uid_avp_db.c} | 4 +- .../{avp_db/avp_db.h => uid_avp_db/uid_avp_db.h} | 3 + 13 files changed, 35 insertions(+), 32 deletions(-) diff --git a/modules_s/avp_db/Makefile b/modules_s/uid_avp_db/Makefile similarity index 94% rename from modules_s/avp_db/Makefile rename to modules_s/uid_avp_db/Makefile index a928e94..8a5267f 100644 --- a/modules_s/avp_db/Makefile +++ b/modules_s/uid_avp_db/Makefile @@ -7,7 +7,7 @@ include ../../Makefile.defs auto_gen= -NAME=avp_db.so +NAME=uid_avp_db.so LIBS= DEFS += -Wall diff --git a/modules_s/avp_db/README b/modules_s/uid_avp_db/README similarity index 95% rename from modules_s/avp_db/README rename to modules_s/uid_avp_db/README index ce13079..17f2cfa 100644 --- a/modules_s/avp_db/README +++ b/modules_s/uid_avp_db/README @@ -1,11 +1,11 @@ -1. avp_db Module +1. uid_avp_db Module Jiri Kuthan FhG FOKUS &lt;jiri(a)iptel.org&gt; - Copyright © 2004, 2005 FhG FOKUS + Copyright � 2004, 2005 FhG FOKUS __________________________________________________________________ 1.1. Overview @@ -151,23 +151,23 @@ Jiri Kuthan be set. key_column - Column name holding key. Default value is “id”. + Column name holding key. Default value is "id". name_column Column name used for storing attribute name. Default value is - “name”. + "name". value_column Column name used for storing attribute value. Default value is - “value”. + "value". type_column Column name used for storing attribute type. Default value is - “type”. + "type". flags_column Column name used for storing attribute flags. Default value is - “flags”. + "flags". None defined by default. @@ -188,7 +188,7 @@ mysql> describe dlg_attrs; +--------+------------------+------+-----+---------+-------+ 5 rows in set (0.00 sec) - Setting flags from code (all attrs beginning with “dlg_”): + Setting flags from code (all attrs beginning with "dlg_"): avpflags dialog_flag; ... route { @@ -242,8 +242,8 @@ route { Loads 'extra attributes' stored by previous call to save_extra_attrs. group_id - Identifies attribute group, see Section 1.3.12, “attr_group - (string)”. + Identifies attribute group, see Section 1.3.12, "attr_group + (string)". id Identifies attributes which should be loaded. @@ -253,8 +253,8 @@ route { Saves 'extra attributes' flagged by group flag under given id. group_id - Identifies attribute group, see Section 1.3.12, “attr_group - (string)”. + Identifies attribute group, see Section 1.3.12, "attr_group + (string)". id Identifier stored with flagged attributes. @@ -264,8 +264,8 @@ route { Removes all extra attributes with given id. group_id - Identifies attribute group, see Section 1.3.12, “attr_group - (string)”. + Identifies attribute group, see Section 1.3.12, "attr_group + (string)". id Identifies attributes which should be removed. @@ -276,8 +276,8 @@ route { id). group_id - Identifies attribute group, see Section 1.3.12, “attr_group - (string)”. + Identifies attribute group, see Section 1.3.12, "attr_group + (string)". id Identifies attributes which should be locked. @@ -288,8 +288,8 @@ route { only id). group_id - Identifies attribute group, see Section 1.3.12, “attr_group - (string)”. + Identifies attribute group, see Section 1.3.12, "attr_group + (string)". id Identifies attributes which should be unlocked. @@ -352,8 +352,8 @@ route["create_dialog"] { } onreply_route["dialog_creation_reply"] { - xplog("L_ERR", "dialog creation reply (%rs, %(a)cseq.method) [%(a)from.tag, % -(a)to.tag]\n&quot;)uot;); + xplog("L_ERR", "dialog creation reply (%rs, %(a)cseq.method) [%(a)from.tag, +%(a)to.tag]\n&quot;)uot;); $res = @msg.response.code; xplog("L_ERR", " ... response: %$res\n"); @@ -362,8 +362,8 @@ onreply_route["dialog_creation_reply"] { break; } if ($res < 101) { - xplog("L_ERR", " ... I won't create dialog from 100 response.\n") -; + xplog("L_ERR", " ... I won't create dialog from 100 response.\n" +); break; } @@ -539,8 +539,8 @@ route["trace_dialog"] { onreply_route["dialog_reply"] { if ($id) { - xplog("L_ERR", "In-dialog reply (%rs, %(a)cseq.method) [%(a)to.tag, % -(a)from.tag]\n&quot;)uot;); + xplog("L_ERR", "In-dialog reply (%rs, %(a)cseq.method) [%(a)to.tag, +%(a)from.tag]\n&quot;)uot;); if (!route("load_dialog")) { xplog("L_ERR", "Can't load dialog data\n"); } @@ -615,8 +615,8 @@ route { t_on_reply("dialog_reply"); } else { - xplog("L_ERR", "Message within unknown dialog: %@cseq, to -_tag=%(a)to.tag from_tag=%(a)from.tag\n&quot;)uot;); + xplog("L_ERR", "Message within unknown dialog: %@cseq, t +o_tag=%(a)to.tag from_tag=%(a)from.tag\n&quot;)uot;); } } diff --git a/modules_s/avp_db/avp_db.xml b/modules_s/uid_avp_db/avp_db.xml similarity index 100% rename from modules_s/avp_db/avp_db.xml rename to modules_s/uid_avp_db/avp_db.xml diff --git a/modules_s/avp_db/doc/Makefile b/modules_s/uid_avp_db/doc/Makefile similarity index 75% rename from modules_s/avp_db/doc/Makefile rename to modules_s/uid_avp_db/doc/Makefile index e2d8b0f..b6fb889 100644 --- a/modules_s/avp_db/doc/Makefile +++ b/modules_s/uid_avp_db/doc/Makefile @@ -1,4 +1,4 @@ -docs = avp_db.xml +docs = uid_avp_db.xml docbook_dir=../../../docbook include $(docbook_dir)/Makefile.module diff --git a/modules_s/avp_db/doc/avp_dialogs.cfg b/modules_s/uid_avp_db/doc/avp_dialogs.cfg similarity index 100% rename from modules_s/avp_db/doc/avp_dialogs.cfg rename to modules_s/uid_avp_db/doc/avp_dialogs.cfg diff --git a/modules_s/avp_db/doc/fifo.xml b/modules_s/uid_avp_db/doc/fifo.xml similarity index 100% rename from modules_s/avp_db/doc/fifo.xml rename to modules_s/uid_avp_db/doc/fifo.xml diff --git a/modules_s/avp_db/doc/functions.xml b/modules_s/uid_avp_db/doc/functions.xml similarity index 100% rename from modules_s/avp_db/doc/functions.xml rename to modules_s/uid_avp_db/doc/functions.xml diff --git a/modules_s/avp_db/doc/params.xml b/modules_s/uid_avp_db/doc/params.xml similarity index 100% rename from modules_s/avp_db/doc/params.xml rename to modules_s/uid_avp_db/doc/params.xml diff --git a/modules_s/avp_db/doc/avp_db.xml b/modules_s/uid_avp_db/doc/uid_avp_db.xml similarity index 98% rename from modules_s/avp_db/doc/avp_db.xml rename to modules_s/uid_avp_db/doc/uid_avp_db.xml index 797dffc..9ef3a5c 100644 --- a/modules_s/avp_db/doc/avp_db.xml +++ b/modules_s/uid_avp_db/doc/uid_avp_db.xml @@ -4,7 +4,7 @@ <section id="avp_db" xmlns:xi="http://www.w3.org/2001/XInclude"> <sectioninfo> - <title>avp_db Module</title> + <title>uid_avp_db Module</title> <authorgroup> <author> <firstname>Jiri</firstname> diff --git a/modules_s/avp_db/extra_attrs.c b/modules_s/uid_avp_db/extra_attrs.c similarity index 99% rename from modules_s/avp_db/extra_attrs.c rename to modules_s/uid_avp_db/extra_attrs.c index 0c32def..2b7b4ab 100644 --- a/modules_s/avp_db/extra_attrs.c +++ b/modules_s/uid_avp_db/extra_attrs.c @@ -1,5 +1,5 @@ #include "extra_attrs.h" -#include "avp_db.h" +#include "uid_avp_db.h" #include "../../usr_avp.h" #include "../../sr_module.h" #include "../../ut.h" diff --git a/modules_s/avp_db/extra_attrs.h b/modules_s/uid_avp_db/extra_attrs.h similarity index 100% rename from modules_s/avp_db/extra_attrs.h rename to modules_s/uid_avp_db/extra_attrs.h diff --git a/modules_s/avp_db/avp_db.c b/modules_s/uid_avp_db/uid_avp_db.c similarity index 99% rename from modules_s/avp_db/avp_db.c rename to modules_s/uid_avp_db/uid_avp_db.c index 495c78f..0f9f01d 100644 --- a/modules_s/avp_db/avp_db.c +++ b/modules_s/uid_avp_db/uid_avp_db.c @@ -46,7 +46,7 @@ #include "../../ut.h" #include "../../id.h" #include "../domain/domain.h" -#include "avp_db.h" +#include "uid_avp_db.h" #include "extra_attrs.h" MODULE_VERSION @@ -118,7 +118,7 @@ static param_export_t params[] = { struct module_exports exports = { - "avp_db", + "uid_avp_db", cmds, /* Exported commands */ 0, /* RPC methods */ params, /* Exported parameters */ diff --git a/modules_s/avp_db/avp_db.h b/modules_s/uid_avp_db/uid_avp_db.h old mode 100755 new mode 100644 similarity index 95% rename from modules_s/avp_db/avp_db.h rename to modules_s/uid_avp_db/uid_avp_db.h index 74d3c6a..26dcc39 --- a/modules_s/avp_db/avp_db.h +++ b/modules_s/uid_avp_db/uid_avp_db.h @@ -25,7 +25,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef UID_AVP_DB_H +#define UID_AVP_DB_H #include "../../lib/srdb2/db.h" extern db_ctx_t* ctx; extern int auto_unlock; +#endif