sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:janakj/postgres: Provide two useful macros for str initialization: STR_STATIC_INIT() and

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: a9b67b6b16d7b127b8a6290efed08d174c358cd4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9b67b6… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Thu Nov 17 03:49:37 2005 +0000 Provide two useful macros for str initialization: STR_STATIC_INIT() and STR_NULL. Adjust all modules to use those macros where appropriate. Verified by: md5(1) (those modules, which actually compile) --- modules/db_postgres/res.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/res.c b/modules/db_postgres/res.c index 1f72a6e..19070bc 100644 --- a/modules/db_postgres/res.c +++ b/modules/db_postgres/res.c @@ -173,7 +173,7 @@ static inline void free_rows(db_res_t* res) static inline int convert_cell(db_con_t* con, db_res_t* res, int row, int col) { - static str dummy_str = {"", 0}; + static str dummy_str = STR_STATIC_INIT(""); PGresult* pgres; db_val_t* val; int type, pglen;

15 years, 10 months

git:janakj/postgres: - gcc 4.0 warning & fixes "forward" ported from stable

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 72f7960fc239c3f05691be5880b0ffd8cb36968d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72f7960… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jul 20 17:16:17 2005 +0000 - gcc 4.0 warning & fixes "forward" ported from stable - postgres fixes/warnings "forward" ported from stable --- modules/db_postgres/aug_alloc.c | 5 +++-- modules/db_postgres/aug_alloc.h | 5 +++-- modules/db_postgres/aug_debug.h | 7 ++++++- modules/db_postgres/aug_util.c | 1 - modules/db_postgres/db_val.c | 4 ++-- modules/db_postgres/dbase.c | 4 +++- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/modules/db_postgres/aug_alloc.c b/modules/db_postgres/aug_alloc.c index 88355c8..e653456 100644 --- a/modules/db_postgres/aug_alloc.c +++ b/modules/db_postgres/aug_alloc.c @@ -374,7 +374,7 @@ augExport void *aug_realloc_loc(size_t size, void *prev, char *file, int line) return alloc; } -augExport void aug_free_loc(void *alloc, char *file, int line) +augExport void aug_free_loc(const void *alloc, char *file, int line) { MemHead *mem, *par; DABNAME("aug_free"); @@ -486,7 +486,8 @@ augExport void aug_foster_loc(void *alloc, void *parent, char *file, int line) mem->m.sibling = 0; } -augExport char *aug_strdup_loc(char *str, void *parent, char *file, int line) +augExport char *aug_strdup_loc(const char *str, void *parent, char *file, + int line) { char *new; size_t size; diff --git a/modules/db_postgres/aug_alloc.h b/modules/db_postgres/aug_alloc.h index 25aad8d..c9c1985 100644 --- a/modules/db_postgres/aug_alloc.h +++ b/modules/db_postgres/aug_alloc.h @@ -84,9 +84,10 @@ extern augNoMemFunc *aug_set_nomem_func(augNoMemFunc *new_func); extern void *aug_alloc_loc(size_t size, void *parent, char *file, int line); extern void *aug_realloc_loc(size_t size, void *prev, char *file, int line); -extern char *aug_strdup_loc(char *str, void *parent, char *file, int line); +extern char *aug_strdup_loc(const char *str, void *parent, char *file, + int line); extern char **aug_vecdup_loc(char **vec, void *parent, char *file, int line); -extern void aug_free_loc(void *mem, char *file, int line); +extern void aug_free_loc(const void *mem, char *file, int line); extern void aug_foster_loc(void *mem, void *new_parent, char *file, int line); extern augAllocStats *aug_alloc_stats(void); diff --git a/modules/db_postgres/aug_debug.h b/modules/db_postgres/aug_debug.h index d236e22..a112489 100644 --- a/modules/db_postgres/aug_debug.h +++ b/modules/db_postgres/aug_debug.h @@ -126,9 +126,14 @@ extern augBool aug_dab_enabled; #else +#ifdef __SUNPRO_C + #define DABL_NOP(...) /* ignore */ +#else + #define DABL_NOP(args...) /* ignore */ +#endif #define DABNAME(name) #define DABLEVEL(lev) (augFALSE) -#define DABL(lev) (augFALSE) && +#define DABL(lev) DABL_NOP #define DAB DABL(0) #define DABTRACE DABL(0) #define DABBULK DABL(0) diff --git a/modules/db_postgres/aug_util.c b/modules/db_postgres/aug_util.c index 83d2faa..b0c8563 100644 --- a/modules/db_postgres/aug_util.c +++ b/modules/db_postgres/aug_util.c @@ -111,7 +111,6 @@ augExport void aug_abort(char *file, int line, char *fmt, ...) augExport void aug_setmodule(char *name) { char *prog; - int len; if(!name) return; diff --git a/modules/db_postgres/db_val.c b/modules/db_postgres/db_val.c index b885341..8f7ad1a 100644 --- a/modules/db_postgres/db_val.c +++ b/modules/db_postgres/db_val.c @@ -223,7 +223,7 @@ int str2valp(db_type_t _t, db_val_t* _v, const char* _s, int _l, void *_p) case DB_STR: VAL_STR(_v).s = aug_alloc(_l + 1, _p); - memcpy(_s, VAL_STR(_v).s, _l); + memcpy(VAL_STR(_v).s, _s, _l); VAL_STR(_v).s[_l] = (char) 0; VAL_STR(_v).len = _l; VAL_TYPE(_v) = DB_STR; @@ -248,7 +248,7 @@ int str2valp(db_type_t _t, db_val_t* _v, const char* _s, int _l, void *_p) case DB_BLOB: VAL_STR(_v).s = aug_alloc(_l + 1, _p); - memcpy(_s, VAL_STR(_v).s, _l); + memcpy(VAL_STR(_v).s, _s, _l); VAL_STR(_v).s[_l] = (char) 0; VAL_STR(_v).len = _l; VAL_TYPE(_v) = DB_BLOB; diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index 21d3e2f..75bb54f 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -234,6 +234,7 @@ static int disconnect_db(db_con_t* _h) db_con_t *db_init(const char* _sqlurl) { db_con_t* res; + void* t; DLOG("db_init", "entry"); @@ -242,7 +243,8 @@ db_con_t *db_init(const char* _sqlurl) */ res = aug_alloc(sizeof(db_con_t), 0); memset(res, 0, sizeof(db_con_t)); - res->tail = aug_alloc(sizeof(struct con_postgres), (char*)res); + t = aug_alloc(sizeof(struct con_postgres), (char*)res); + res->tail = (unsigned long) t; memset((struct con_postgres*)res->tail, 0, sizeof(struct con_postgres)); if (connect_db(res, _sqlurl) < 0)

15 years, 10 months

git:janakj/postgres: - module interface exended with list of management functions

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 0bc4d9a83890a791b48a2f82874f023d7a541c7e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0bc4d9a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Dec 13 00:19:29 2005 +0000 - module interface exended with list of management functions --- modules/db_postgres/db_mod.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index 30eb47f..e8387df 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -69,6 +69,7 @@ static param_export_t params[] = { struct module_exports exports = { "postgres", cmds, + 0, /* RPC methods */ params, /* module parameters */ 0, /* module initialization function */ 0, /* response function*/

15 years, 10 months

git:janakj/postgres: - merge 0.9.0 latest fixes/changes: radius modules makefiles and

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 3e7dc7161fd4b60dbe44a2611e6a8cac02fabd2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e7dc71… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jun 30 21:29:31 2005 +0000 - merge 0.9.0 latest fixes/changes: radius modules makefiles and libradiusclient/radiusclient-ng selection and various minor compile fixes --- modules/db_postgres/Makefile | 4 ++-- modules/db_postgres/aug_alloc.c | 3 ++- modules/db_postgres/aug_sysdep.h | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index f42049b..980587f 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -7,8 +7,8 @@ auto_gen= NAME=postgres.so # libpq-fe.h locations -DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ - -I/usr/include/postgresql +DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ + -I/usr/include/postgresql -I/usr/include/postgresql/8.0 LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -lpq include ../../Makefile.modules diff --git a/modules/db_postgres/aug_alloc.c b/modules/db_postgres/aug_alloc.c index 6d543d2..88355c8 100644 --- a/modules/db_postgres/aug_alloc.c +++ b/modules/db_postgres/aug_alloc.c @@ -115,6 +115,7 @@ struct MemOpt static int mem_bad(MemHead *mem, char *where, char *file, int line) { aug_abort(file, line, "Corrupted memory in %s", where); + return 0; } /* @@ -225,7 +226,7 @@ static void *mem_alloc(size_t size, void *parent, char *file, int line) if(par) { - if(mem->m.sibling = par->m.child) + if((mem->m.sibling = par->m.child)) mem->m.sibling->m.parent = mem; par->m.child = mem; } diff --git a/modules/db_postgres/aug_sysdep.h b/modules/db_postgres/aug_sysdep.h index 42936c2..cea0c0a 100644 --- a/modules/db_postgres/aug_sysdep.h +++ b/modules/db_postgres/aug_sysdep.h @@ -158,6 +158,17 @@ typedef unsigned int augUInt32; typedef unsigned int augUInt32; #endif +#if defined(x86_64) || defined(__x86_64) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Sun Solaris x86_64 with GCC" +#else +#define AUG_CONFIGURATION "Sun Solaris x86_64 with SUNpro C" +#endif + +typedef unsigned int augUInt32; + +#endif #if defined(sparc) || defined(__sparc) #if defined(__svr4__) || defined(__SVR4) @@ -204,7 +215,16 @@ typedef unsigned int augUInt32; typedef unsigned int augUInt32; -#endif /* i386 */ +#endif /* x86 */ +#if defined(__x86_64) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Linux x86_64 with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* x86-64 */ #endif /* linux */ /* @@ -244,7 +264,16 @@ typedef unsigned int augUInt32; typedef unsigned int augUInt32; -#endif /* i386 */ +#endif /* x86 */ +#if defined(__x86_64) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "FreeBSD x86_64 with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* x86_64 */ #endif /* freebsd */ /* @@ -324,7 +353,7 @@ typedef unsigned int augUInt32; */ #ifndef AUG_CONFIGURATION -error: os/cpu/compiler combination not configured in $Source$ $Revision$ +#error: os/cpu/compiler combination not configured in $Source$ $Revision$ #endif #endif /* AUG_SYSDEP_H */

15 years, 10 months

git:janakj/postgres: - compilation fixes for gcc 4.0

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: a7985cf61570d2835b9b5d88a5904f7d83d207ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7985cf… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Jul 1 08:58:35 2005 +0000 - compilation fixes for gcc 4.0 --- modules/db_postgres/dbase.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index 253fe8d..21d3e2f 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -242,7 +242,7 @@ db_con_t *db_init(const char* _sqlurl) */ res = aug_alloc(sizeof(db_con_t), 0); memset(res, 0, sizeof(db_con_t)); - (struct con_postgres*)res->tail = aug_alloc(sizeof(struct con_postgres), (char*)res); + res->tail = aug_alloc(sizeof(struct con_postgres), (char*)res); memset((struct con_postgres*)res->tail, 0, sizeof(struct con_postgres)); if (connect_db(res, _sqlurl) < 0)

15 years, 10 months

git:janakj/postgres: - improved documentation system

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 842ca23a570cab666a178a2dee13f4d53fb2f33f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=842ca23… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sat Jul 23 23:21:36 2005 +0000 - improved documentation system - documentation makefiles - proper documentation dependency tracking in makefiles - XML-based dialect of docbook used with xi:include inclusions --- modules/db_postgres/doc/postgres.sgml | 52 ------------- modules/db_postgres/doc/postgres_devel.sgml | 22 ------ modules/db_postgres/doc/postgres_faq.sgml | 67 ---------------- modules/db_postgres/doc/postgres_user.sgml | 110 --------------------------- 4 files changed, 0 insertions(+), 251 deletions(-) diff --git a/modules/db_postgres/doc/postgres.sgml b/modules/db_postgres/doc/postgres.sgml deleted file mode 100644 index b814928..0000000 --- a/modules/db_postgres/doc/postgres.sgml +++ /dev/null @@ -1,52 +0,0 @@ -<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [ - - -<!ENTITY user SYSTEM "postgres_user.sgml"> -<!ENTITY devel SYSTEM "postgres_devel.sgml"> -<!ENTITY faq SYSTEM "postgres_faq.sgml"> - - -<!ENTITY % serentities SYSTEM "../../../doc/ser_entities.sgml"> -%serentities; - -]> - -<book> - <bookinfo> - <title>postgres Module</title> - <productname class="trade">&sername;</productname> - <authorgroup> - <author> - <firstname>Greg</firstname> - <surname>Fausak</surname> - <affiliation><orgname>August.net</orgname></affiliation> - <address> - <email>greg(a)august.net</email> - </address> - </author> - <editor> - <firstname>Greg</firstname> - <surname>Fausak</surname> - <address> - <email>greg(a)august.net</email> - </address> - </editor> - </authorgroup> - <copyright> - <year>2003</year> - <holder>Greg Fausak</holder> - </copyright> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> - </bookinfo> - <toc></toc> - - &user; - &devel; - &faq; - -</book> diff --git a/modules/db_postgres/doc/postgres_devel.sgml b/modules/db_postgres/doc/postgres_devel.sgml deleted file mode 100644 index 9983429..0000000 --- a/modules/db_postgres/doc/postgres_devel.sgml +++ /dev/null @@ -1,22 +0,0 @@ - - -<chapter> - <chapterinfo> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> - </chapterinfo> - <title>Developer's Guide</title> - <para> - The module does not provide any sort of API to use in other SER modules. - </para> -</chapter> - - diff --git a/modules/db_postgres/doc/postgres_faq.sgml b/modules/db_postgres/doc/postgres_faq.sgml deleted file mode 100644 index 9322cc4..0000000 --- a/modules/db_postgres/doc/postgres_faq.sgml +++ /dev/null @@ -1,67 +0,0 @@ - - -<chapter> - <chapterinfo> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> - </chapterinfo> - <title>Frequently Asked Questions</title> - <qandaset defaultlabel="number"> - <qandaentry> - <question> - <para>Where can I find more about &ser;?</para> - </question> - <answer> - <para> - Take a look at &serhomelink;. - </para> - </answer> - </qandaentry> - <qandaentry> - <question> - <para>Where can I post a question about this module?</para> - </question> - <answer> - <para> - First at all check if your question was already answered on one of - our mailing lists: - </para> - <itemizedlist> - <listitem> - <para>&seruserslink;</para> - </listitem> - <listitem> - <para>&serdevlink;</para> - </listitem> - </itemizedlist> - <para> - E-mails regarding any stable version should be sent to &serusersmail; and e-mail - regarding development versions or CVS snapshots should be send to &serdevmail;. - </para> - <para> - If you want to keep the mail private, send it to &serhelpmail;. - </para> - </answer> - </qandaentry> - <qandaentry> - <question> - <para>How can I report a bug?</para> - </question> - <answer> - <para> - Please follow the guidelines provided at: &serbugslink; - </para> - </answer> - </qandaentry> - </qandaset> -</chapter> - - diff --git a/modules/db_postgres/doc/postgres_user.sgml b/modules/db_postgres/doc/postgres_user.sgml deleted file mode 100644 index 2d68cfe..0000000 --- a/modules/db_postgres/doc/postgres_user.sgml +++ /dev/null @@ -1,110 +0,0 @@ - - -<chapter> - <chapterinfo> - <revhistory> - <revision> - <revnumber>$Revision$</revnumber> - <date>$Date$</date> - </revision> - </revhistory> - </chapterinfo> - <title>User's Guide</title> - - <section> - <title>Overview</title> - <para>Module description</para> - </section> - <section> - <title>Dependencies</title> - <section> - <title>&ser; Modules</title> - <para> - The following modules must be loaded before this module: - <itemizedlist> - <listitem> - <para> - <emphasis>No dependencies on other &ser; modules</emphasis>. - </para> - </listitem> - </itemizedlist> - </para> - </section> - <section> - <title>External Libraries or Applications</title> - <para> - The following libraries or applications must be installed before running - &ser; with this module loaded: - <itemizedlist> - <listitem> - <para> - <emphasis>None</emphasis>. - </para> - </listitem> - </itemizedlist> - </para> - </section> - </section> - <section> - <title>Exported Parameters</title> - <section> - <title><varname>param_name</varname> (param_type)</title> - <para> - Param description. - </para> - <para> - <emphasis> - Default value is <quote>value</quote>. - </emphasis> - </para> - <example> - <title>Set <varname>param_name</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("module", "param_name", "param_value") -... -</programlisting> - </example> - </section> - </section> - <section> - <title>Exported Functions</title> - <section> - <title> - <function moreinfo="none">function_name(param1, param2)</function> - </title> - <para> - Description - </para> - <para>Meaning of the parameters is as follows:</para> - <itemizedlist> - <listitem> - <para><emphasis>param1</emphasis> - description. - </para> - </listitem> - <listitem> - <para><emphasis>param2</emphasis> - description. - </para> - </listitem> - </itemizedlist> - <example> - <title><function>function_name</function> usage</title> - <programlisting format="linespecific"> -... -function_name("sample_param1", "sample_param2"); -... -</programlisting> - </example> - </section> - </section> - <section> - <title>Installation & Running</title> - <para>Notes about installation and running.</para> - </section> -</chapter> - -

15 years, 10 months

git:janakj/postgres: - makefiles cleanups (use $(LOCALBASE) everywhere) -- fixes some include

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 97c92f6826b295a6cad71e5b71da1706e5a26370 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97c92f6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 1 22:25:05 2005 +0000 - makefiles cleanups (use $(LOCALBASE) everywhere) -- fixes some include path problems on netbsd --- modules/db_postgres/Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 56bced5..f42049b 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -7,8 +7,8 @@ auto_gen= NAME=postgres.so # libpq-fe.h locations -DEFS +=-I$(LOCALBASE)/include -I/usr/local/pgsql/include -I/usr/include/postgresql -LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L/usr/pkg/lib \ - -L/usr/pkg/lib/pgsql -lpq +DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ + -I/usr/include/postgresql +LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -lpq include ../../Makefile.modules

15 years, 10 months

git:janakj/postgres: Add paths required to build on SUSE Linux

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 6cef29c01e8335e622b2cc5e2900586571788240 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6cef29c… Author: Peter Nixon <listuser(a)peternixon.net> Committer: Peter Nixon <listuser(a)peternixon.net> Date: Wed Aug 31 08:50:14 2005 +0000 Add paths required to build on SUSE Linux --- modules/db_postgres/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 980587f..342e8a3 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -8,7 +8,8 @@ NAME=postgres.so # libpq-fe.h locations DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/pgsql/include \ - -I/usr/include/postgresql -I/usr/include/postgresql/8.0 -LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -lpq + -I/usr/include/postgresql -I/usr/include/postgresql/8.0 \ + -I/usr/include/pgsql/ +LIBS=-L$(LOCALBASE)/lib -L$(LOCALBASE)/pgsql/lib -L$(LOCALBASE)/lib/pgsql -L /usr/lib -lpq include ../../Makefile.modules

15 years, 10 months

git:janakj/postgres: - Spelling checked

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: dbbb5df46a36f04cddd2b108dc200761117cb2c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dbbb5df… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Aug 24 08:58:23 2004 +0000 - Spelling checked - READMEs updated --- modules/db_postgres/README | 175 +++++++++++++++++++++++++++++--------- modules/db_postgres/aug_sysdep.h | 4 +- modules/db_postgres/db_mod.c | 4 +- modules/db_postgres/db_utils.c | 4 +- modules/db_postgres/db_val.c | 2 +- 5 files changed, 143 insertions(+), 46 deletions(-) diff --git a/modules/db_postgres/README b/modules/db_postgres/README index 5ced10b..6e2bd9c 100644 --- a/modules/db_postgres/README +++ b/modules/db_postgres/README @@ -1,39 +1,136 @@ -# $Id$ -# -# README -# -# History: -# -------- -# 2003-04-07 this is a hack, from serctl, to make work with postgres -# -# DISCLAIMER: -# I have yet to get this software working in my production environment. -# Everything compiles and runs, but not for long. It may or may not be a -# good starting point for the ser postgres driver. -# -# I had a hard time with memory while developing this. -# So, I decided to incorporate some memory routines that -# I have been using for years. This didn't fix the problem, -# but it did make memory management easier. -# -# The postgres driver requires that you have postgres installed -# on your system. You can download this from: www.postgresql.org. -# For this I used postgres version 7.3.2, but I imagine almost any -# recent version should work. -# -# You will then need to have a postgres database somewhere, and it -# needs to have the tables created in it. Currently I am supporting -# 2 tables, location and subscriber. The file createtables.txt contains -# the table definitions and index definitions. -# -# You may wish to load the tables from a 0.8.10 database. The script -# copy_to_psql can be modified to open your mysql database and it outputs -# the necessary commands to populate the tables of the postgres database. -# -# To use the postgres module in your ser.cfg file is just like using the -# mysql module. Ie: -# loadmodule "/usr/local/lib/ser/modules/postgres.so" -# -# That's it. Good luck. -# ---greg -# Greg Fausak, August.Net Services, greg(a)august.net + +postgres Module + +Greg Fausak + + August.net + +Edited by + +Greg Fausak + + Copyright � 2003 Greg Fausak + _________________________________________________________ + + Table of Contents + 1. User's Guide + + 1.1. Overview + 1.2. Dependencies + + 1.2.1. SER Modules + 1.2.2. External Libraries or Applications + + 1.3. Exported Parameters + + 1.3.1. param_name (param_type) + + 1.4. Exported Functions + + 1.4.1. function_name(param1, param2) + + 1.5. Installation & Running + + 2. Developer's Guide + 3. Frequently Asked Questions + + List of Examples + 1-1. Set param_name parameter + 1-2. function_name usage + _________________________________________________________ + +Chapter 1. User's Guide + +1.1. Overview + + Module description + _________________________________________________________ + +1.2. Dependencies + +1.2.1. SER Modules + + The following modules must be loaded before this module: + + * No dependencies on other SER modules. + _________________________________________________________ + +1.2.2. External Libraries or Applications + + The following libraries or applications must be installed + before running SER with this module loaded: + + * None. + _________________________________________________________ + +1.3. Exported Parameters + +1.3.1. param_name (param_type) + + Param description. + + Default value is "value". + + Example 1-1. Set param_name parameter +... +modparam("module", "param_name", "param_value") +... + _________________________________________________________ + +1.4. Exported Functions + +1.4.1. function_name(param1, param2) + + Description + + Meaning of the parameters is as follows: + + * param1 - description. + * param2 - description. + + Example 1-2. function_name usage +... +function_name("sample_param1", "sample_param2"); +... + _________________________________________________________ + +1.5. Installation & Running + + Notes about installation and running. + _________________________________________________________ + +Chapter 2. Developer's Guide + + The module does not provide any sort of API to use in other + SER modules. + _________________________________________________________ + +Chapter 3. Frequently Asked Questions + + 3.1. Where can I find more about SER? + 3.2. Where can I post a question about this module? + 3.3. How can I report a bug? + + 3.1. Where can I find more about SER? + + Take a look at http://iptel.org/ser. + + 3.2. Where can I post a question about this module? + + First at all check if your question was already answered on + one of our mailing lists: + + * http://mail.iptel.org/mailman/listinfo/serusers + * http://mail.iptel.org/mailman/listinfo/serdev + + E-mails regarding any stable version should be sent to + <serusers(a)iptel.org> and e-mail regarding development versions + or CVS snapshots should be send to <serdev(a)iptel.org>. + + If you want to keep the mail private, send it to + <serhelp(a)iptel.org>. + + 3.3. How can I report a bug? + + Please follow the guidelines provided at: + http://iptel.org/ser/bugs diff --git a/modules/db_postgres/aug_sysdep.h b/modules/db_postgres/aug_sysdep.h index 78b594a..42936c2 100644 --- a/modules/db_postgres/aug_sysdep.h +++ b/modules/db_postgres/aug_sysdep.h @@ -60,7 +60,7 @@ #define AUG_SYSDEP_H /* -** As necessary, detect operating system, cpu, and compiler +** As necessary, detect operating system, CPU, and compiler ** combinations, and establish defines that describe the ** characteristics and requirements for the combination. ** @@ -73,7 +73,7 @@ ** AUG_NO_xxxx System doesn't have capability xxxx ** AUG_BAD_xxxx System has xxxx, but it's broken ** -** Every system gets AUG_CONFIGURATION so we can reject unconfigured +** Every system gets AUG_CONFIGURATION so we can reject misconfigured ** compiles. This should be set to an os/cpu/compiler description. */ #undef AUG_CONFIGURATION diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index 435b8eb..7f8dd59 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -3,7 +3,7 @@ * * Postgres module interface * - * Copyright (C) 2001-2003 Fhg Fokus + * Copyright (C) 2001-2003 FhG Fokus * * This file is part of ser, a free SIP server. * @@ -66,7 +66,7 @@ static cmd_export_t cmds[]={ struct module_exports exports = { "postgres", cmds, - 0, /* module paramers */ + 0, /* module parameters */ mod_init, /* module initialization function */ 0, /* response function*/ diff --git a/modules/db_postgres/db_utils.c b/modules/db_postgres/db_utils.c index e7f8fca..d5febbb 100644 --- a/modules/db_postgres/db_utils.c +++ b/modules/db_postgres/db_utils.c @@ -115,7 +115,7 @@ int parse_sql_url(char* _url, char** _user, char** _pass, /* - * Remove any tabs and spaces from the begining and the end of + * Remove any tabs and spaces from the beginning and the end of * a string */ char* trim(char* _s) @@ -126,7 +126,7 @@ char* trim(char* _s) /* Null pointer, there is nothing to do */ if (!_s) return _s; - /* Remove spaces and tabs from the begining of string */ + /* Remove spaces and tabs from the beginning of string */ while ((*_s == ' ') || (*_s == '\t')) _s++; len = strlen(_s); diff --git a/modules/db_postgres/db_val.c b/modules/db_postgres/db_val.c index d80ec04..b885341 100644 --- a/modules/db_postgres/db_val.c +++ b/modules/db_postgres/db_val.c @@ -351,7 +351,7 @@ int val2str(db_val_t* _v, char* _s, int* _len) break; default: - DBG("val2str(): Unknow data type\n"); + DBG("val2str(): Unknown data type\n"); return -7; } return -8;

15 years, 10 months

git:janakj/postgres: Change DSN parser a bit, so that it' s possible to specify path to the unix

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e39877fe6b11335e47719791bdda74f73b62bbf4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e39877f… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Mon Dec 6 13:02:10 2004 +0000 Change DSN parser a bit, so that it's possible to specify path to the unix domain socket for communication with DB server. Consider everything after '@' but before the last '/' to be host name (currently everything after '@' but before first '/' is considered hostname), so that in the case of the socket in the /foo/bar directory, one can specify DSN as follows: postgres://username:password@/foo/bar/name_of_table No response from: lgfausak(a)august.net --- modules/db_postgres/db_utils.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/db_utils.c b/modules/db_postgres/db_utils.c index d5febbb..69e722e 100644 --- a/modules/db_postgres/db_utils.c +++ b/modules/db_postgres/db_utils.c @@ -77,7 +77,9 @@ int parse_sql_url(char* _url, char** _user, char** _pass, at = strchr(slash, '@'); - db_slash = strchr(slash, '/'); + db_slash = strrchr(slash, '/'); + if (db_slash <= at) + db_slash = NULL; if (db_slash) { *db_slash++ = '\0'; *_db = trim(db_slash);

15 years, 10 months

← Newer
1
...
32
33
34
35
36
37
38
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009