sr-dev

sr-dev@lists.kamailio.org

13 participants
44204 discussions

git:master: core expr: new internal operators

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ea1babd9d9e6e90629ad4ad091b1ab90241332fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea1babd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 24 14:45:36 2009 +0200 core expr: new internal operators - added RVE_STRLEN_OP, RVE_STREMPTY_OP and RVE_DEFINED_OP --- rvalue.c | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- rvalue.h | 6 ++- 2 files changed, 182 insertions(+), 3 deletions(-) diff --git a/rvalue.c b/rvalue.c index 8bd0aa2..74e8df5 100644 --- a/rvalue.c +++ b/rvalue.c @@ -23,6 +23,7 @@ * History: * -------- * 2008-12-01 initial version (andrei) + * 2009-04-24 added support for defined, strempty, strlen (andrei) */ #include "rvalue.h" @@ -390,6 +391,9 @@ enum rval_type rve_guess_type( struct rval_expr* rve) case RVE_EQ_OP: case RVE_DIFF_OP: case RVE_IPLUS_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: return RV_INT; case RVE_PLUS_OP: /* '+' evaluates to the type of the left operand */ @@ -429,6 +433,9 @@ int rve_is_constant(struct rval_expr* rve) case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: return rve_is_constant(rve->left.rve); case RVE_MINUS_OP: case RVE_MUL_OP: @@ -478,6 +485,9 @@ static int rve_op_unary(enum rval_expr_op op) case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: return 1; case RVE_MINUS_OP: case RVE_MUL_OP: @@ -610,6 +620,7 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, return 1; } } + break; case RVE_CONCAT_OP: *type=RV_STR; if (rve_check_type(&type1, rve->left.rve, bad_rve, bad_t, exp_t)){ @@ -632,6 +643,21 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, return 1; } } + break; + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: + *type=RV_INT; + if (rve_check_type(&type1, rve->left.rve, bad_rve, bad_t, exp_t)){ + if (type1==RV_INT){ + if (bad_rve) *bad_rve=rve->left.rve; + if (bad_t) *bad_t=type1; + if (exp_t) *exp_t=RV_STR; + return 0; + } + return 1; + } + break; case RVE_NONE_OP: break; } @@ -974,7 +1000,7 @@ inline static int int_intop1(int* res, enum rval_expr_op op, int v) -/** integer operation: *res= op v. +/** integer operation: *res= v1 op v2 * @return 0 on succes, \<0 on error */ inline static int int_intop2(int* res, enum rval_expr_op op, int v1, int v2) @@ -1054,6 +1080,27 @@ inline static int bool_strop2( enum rval_expr_op op, int* res, +/** integer returning operation on string: *res= op str (returns integer) + * @return 0 on succes, \<0 on error + */ +inline static int int_strop1(int* res, enum rval_expr_op op, str* s1) +{ + switch(op){ + case RVE_STRLEN_OP: + *res=s1->len; + break; + case RVE_STREMPTY_OP: + *res=(s1->len==0); + break; + default: + BUG("rv unsupported int_strop1 %d\n", op); + return -1; + } + return 0; +} + + + /** integer operation: ret= op v (returns a rvalue). * @return rvalue on success, 0 on error */ @@ -1306,6 +1353,107 @@ error: +/** integer operation on rval evaluated as string. + * Can use cached rvalues (c1 & c2). + * @return 0 success, -1 on error + */ +inline static int rval_int_strop1(struct run_act_ctx* h, + struct sip_msg* msg, + int* res, + enum rval_expr_op op, + struct rvalue* l, + struct rval_cache* c1) +{ + struct rvalue* rv1; + int ret; + + rv1=0; + ret=0; + if ((rv1=rval_convert(h, msg, RV_STR, l, c1))==0) + goto error; + ret=int_strop1(res, op, &rv1->v.s); + rval_destroy(rv1); + return ret; +error: + rval_destroy(rv1); + return 0; +} + + + +/** checks if rv is defined. + * @return 1 defined, 0 not defined, -1 on error + * Can use cached rvalues (c1). + * Note: a rv can be undefined if it's an undefined avp or pvar or + * if it's NONE + */ +inline static int rv_defined(struct run_act_ctx* h, + struct sip_msg* msg, + struct rvalue* rv, struct rval_cache* cache) +{ + avp_t* r_avp; + int_str avp_val; + pv_value_t pval; + int ret; + + ret=1; + switch(rv->type){ + case RV_AVP: + if (unlikely(cache && cache->cache_type==RV_CACHE_AVP)){ + if (cache->val_type==RV_NONE) + ret=0; + }else{ + r_avp = search_avp_by_index(rv->v.avps.type, rv->v.avps.name, + &avp_val, rv->v.avps.index); + if (unlikely(r_avp==0)){ + ret=0; + } + } + break; + case RV_PVAR: + /* PV_VAL_NULL or pv_get_spec_value error => undef */ + if (unlikely(cache && cache->cache_type==RV_CACHE_PVAR)){ + if (cache->val_type==RV_NONE) + ret=0; + }else{ + memset(&pval, 0, sizeof(pval)); + if (likely(pv_get_spec_value(msg, &rv->v.pvs, &pval)==0)){ + if ((pval.flags & PV_VAL_NULL) && + ! (pval.flags & (PV_VAL_INT|PV_VAL_STR))){ + ret=0; + } + pv_value_destroy(&pval); + }else{ + ret=0; /* in case of error, consider it undef */ + } + } + break; + case RV_NONE: + ret=0; + break; + default: + break; + } + return 1; /* defined */ +} + + +/** defined (integer) operation on rve. + * @return 1 defined, 0 not defined, -1 on error + */ +inline static int int_rve_defined(struct run_act_ctx* h, + struct sip_msg* msg, + struct rval_expr* rve) +{ + /* only a rval can be undefined, any expression consisting on more + then one rval => defined */ + if (likely(rve->op==RVE_RVAL_OP)) + return rv_defined(h, msg, &rve->left.rval, 0); + return 1; +} + + + /** evals an integer expr to an int. * * *res=(int)eval(rve) @@ -1431,6 +1579,18 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, *res=0; ret=-1; break; + case RVE_DEFINED_OP: + ret=int_rve_defined(h, msg, rve->left.rve); + break; + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + if (unlikely((rv1=rval_expr_eval(h, msg, rve->left.rve))==0)){ + ret=-1; + break; + } + ret=rval_int_strop1(h, msg, res, rve->op, rv1, 0); + rval_destroy(rv1); + break; case RVE_NONE_OP: /*default:*/ BUG("invalid rval int expression operation %d\n", rve->op); @@ -1503,6 +1663,9 @@ int rval_expr_eval_rvint( struct run_act_ctx* h, case RVE_EQ_OP: case RVE_DIFF_OP: case RVE_IPLUS_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: /* operator forces integer type */ ret=rval_expr_eval_int(h, msg, res_i, rve); *res_rv=0; @@ -1560,7 +1723,7 @@ error: * WARNING: result must be rval_destroy()'ed if non-null (it might be * a reference to another rval). The result can be modified only * if rv_chg_in_place() returns true. - * @result rvalue on success, 0 on error + * @return rvalue on success, 0 on error */ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, struct rval_expr* rve) @@ -1598,6 +1761,9 @@ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, case RVE_EQ_OP: case RVE_DIFF_OP: case RVE_IPLUS_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: /* operator forces integer type */ r=rval_expr_eval_int(h, msg, &i, rve); if (likely(r==0)){ @@ -1800,6 +1966,9 @@ struct rval_expr* mk_rval_expr1(enum rval_expr_op op, struct rval_expr* rve1, case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: break; default: BUG("unsupported unary operator %d\n", op); @@ -1874,6 +2043,9 @@ static int rve_op_is_assoc(enum rval_expr_op op) case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: /* one operand expression => cannot be assoc. */ return 0; case RVE_DIV_OP: @@ -1911,6 +2083,9 @@ static int rve_op_is_commutative(enum rval_expr_op op, enum rval_type type) case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: /* one operand expression => cannot be commut. */ return 0; case RVE_DIV_OP: diff --git a/rvalue.h b/rvalue.h index 88fd6f2..a9dbe0d 100644 --- a/rvalue.h +++ b/rvalue.h @@ -64,8 +64,12 @@ enum rval_expr_op{ RVE_PLUS_OP, /* generic plus (int or str) returns left + right */ RVE_EQ_OP, /* 2 members, returns left == right (int)*/ RVE_DIFF_OP, /* 2 members, returns left != right (int)*/ - RVE_CONCAT_OP,/* string concatenation, returns left . right */ /* str only */ + RVE_CONCAT_OP,/* 2 members, string concat, returns left . right (str)*/ + RVE_STRLEN_OP, /* one member, string length:, returns strlen(val) (int)*/ + RVE_STREMPTY_OP, /* one member, returns val=="" (bool) */ + /* avp, pvars a.s.o */ + RVE_DEFINED_OP, /* one member, returns is_defined(val) (bool) */ };

15 years, 8 months

git:master: core: avp & pvars assignment fixes & changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0789fd246548cb8287777bbe9f8322cffedc8ad4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0789fd2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 24 21:40:26 2009 +0200 core: avp & pvars assignment fixes & changes - fix: delete avps after finding their new value and not before (fixes $v=$v or $v=$avp(v) deleting $v's value) - when assigning something undefined (like a non-existing avp), delete the lvalue. E.g.: $v=$foo and $ foo undefined => delete/undefine $v An expr is undefined only if it consists only on an undefined avp or pvar. If it contains more elements it's always defined (even if all the elements are undefined). E.g: $foo and $bar are undefined => defined $foo == 0, defined $bar == 0, but defined ($foo+$bar) == 1. An avp is undefined if it doesn't exist or there is some error accessing it. A pvar is undefined if it's PV_VAL_NULL or there is an error getting it's value. --- lvalue.c | 95 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 64 insertions(+), 31 deletions(-) diff --git a/lvalue.c b/lvalue.c index 3c409ff..56b7496 100644 --- a/lvalue.c +++ b/lvalue.c @@ -23,6 +23,10 @@ * History: * -------- * 2008-11-30 initial version (andrei) + * 2009-04-24 delete avps after finding their new value and not before + * (fixed $avp=$avp) + * when assigning something undefined (e.g. non-existing avp), + * delete the lvalue (similar to perl) (andrei) */ #include "lvalue.h" @@ -53,19 +57,37 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, unsigned short flags; struct search_state st; int ret, v, destroy_pval; + int avp_add; + +#if 0 + #define AVP_ASSIGN_NOVAL() \ + /* unknown value => reset the avp in function of its type */ \ + flags=avp->type; \ + if (flags & AVP_VAL_STR){ \ + value.s.s=""; \ + value.s.len=0; \ + }else{ \ + value.n=0; \ + } +#endif + #define AVP_ASSIGN_NOVAL() \ + /* no value => delete avp */ \ + avp_add=0 destroy_pval=0; flags = 0; avp=&lv->lv.avps; ret=0; - /* If the left attr was specified without indexing brackets delete - * existing AVPs before adding new ones */ - if ((avp->type & AVP_INDEX_ALL) != AVP_INDEX_ALL) - delete_avp(avp->type, avp->name); + avp_add=1; + switch(rv->type){ case RV_NONE: BUG("non-intialized rval / rval expr \n"); - goto error; + /* unknown value => reset the avp in function of its type */ + flags=avp->type; + AVP_ASSIGN_NOVAL(); + ret=-1; + break; case RV_INT: value.n=rv->v.l; flags=avp->type & ~AVP_VAL_STR; @@ -96,22 +118,22 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, ret=value.n; break; case RV_SEL: + flags=avp->type|AVP_VAL_STR; v=run_select(&value.s, &rv->v.sel, msg); if (unlikely(v!=0)){ + value.s.s=""; + value.s.len=0; if (v<0){ ret=-1; - goto error; - }else { /* v>0 */ - value.s.s=""; - value.s.len=0; - } + break; + } /* v>0 */ } - flags=avp->type|AVP_VAL_STR; ret=(value.s.len>0); break; case RV_AVP: avp_mark=0; if (unlikely((rv->v.avps.type & AVP_INDEX_ALL) == AVP_INDEX_ALL)){ + /* special case: add the value to the avp */ r_avp = search_first_avp(rv->v.avps.type, rv->v.avps.name, &value, &st); while(r_avp){ @@ -136,6 +158,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, ret=1; goto end; }else{ + /* normal case, value is replaced */ r_avp = search_avp_by_index(rv->v.avps.type, rv->v.avps.name, &value, rv->v.avps.index); if (likely(r_avp)){ @@ -146,8 +169,11 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, AVP_NAME_RE)); ret=1; }else{ - ret=-1; - goto error; + /* on error, keep the type of the assigned avp, but + reset it to an empty value */ + AVP_ASSIGN_NOVAL(); + ret=0; + break; } } break; @@ -165,21 +191,22 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, flags=avp->type | AVP_VAL_STR; }else if (pval.flags==PV_VAL_NONE || (pval.flags & (PV_VAL_NULL|PV_VAL_EMPTY))){ - value.s.s=""; - value.s.len=0; + AVP_ASSIGN_NOVAL(); ret=0; - flags=avp->type | AVP_VAL_STR; } }else{ /* non existing pvar */ - value.s.s=""; - value.s.len=0; + /* on error, keep the type of the assigned avp, but + reset it to an empty value */ + AVP_ASSIGN_NOVAL(); ret=0; - flags=avp->type | AVP_VAL_STR; } break; } - if (add_avp(flags & ~AVP_INDEX_ALL, avp->name, value) < 0) { + /* If the left attr was specified without indexing brackets delete + * existing AVPs before adding the new value */ + delete_avp(avp->type, avp->name); + if (avp_add && (add_avp(flags & ~AVP_INDEX_ALL, avp->name, value) < 0)) { ERR("failed to assign value to avp\n"); goto error; } @@ -218,6 +245,10 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, int v; int destroy_pval; + #define PVAR_ASSIGN_NOVAL() \ + /* no value found => "undefine" */ \ + pv_get_null(msg, 0, &pval) + destroy_pval=0; pvar=&lv->lv.pvs; if (unlikely(!pv_is_w(pvar))){ @@ -229,7 +260,9 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, switch(rv->type){ case RV_NONE: BUG("non-intialized rval / rval expr \n"); - goto error; + PVAR_ASSIGN_NOVAL(); + ret=-1; + break; case RV_INT: pval.flags=PV_TYPE_INT|PV_VAL_INT; pval.ri=rv->v.l; @@ -263,12 +296,12 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, pval.flags=PV_VAL_STR; v=run_select(&pval.rs, &rv->v.sel, msg); if (unlikely(v!=0)){ + pval.flags|=PV_VAL_EMPTY; + pval.rs.s=""; + pval.rs.len=0; if (v<0){ ret=-1; - goto error; - }else { /* v>0 */ - pval.rs.s=""; - pval.rs.len=0; + break; } } ret=(pval.rs.len)>0; @@ -287,8 +320,9 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, ret=!(!pval.ri); } }else{ - ret=-1; - goto error; + PVAR_ASSIGN_NOVAL(); + ret=0; /* avp not defined (valid case) */ + break; } break; case RV_PVAR: @@ -299,14 +333,13 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, }else if (pval.flags & PV_VAL_STR){ ret=(pval.rs.len>0); }else{ - ERR("no value in pvar assignment rval\n"); - ret=-1; - goto error; + /* no value / not defined (e.g. avp) -> keep the flags */ + ret=0; } }else{ ERR("non existing right pvar\n"); + PVAR_ASSIGN_NOVAL(); ret=-1; - goto error; } break; }

15 years, 8 months

git:master: Modules: presence

by Juha Heinanen

Module: sip-router Branch: master Commit: e6a0d577ca753e6d4948f127f1c1c3c83fa1bbd4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6a0d57… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 24 16:58:36 2009 +0300 Modules: presence Generated README using the new documentation system. --- modules_k/presence/README | 615 +++++++++++++++++++++++++-------------------- 1 files changed, 339 insertions(+), 276 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e6a…

15 years, 8 months

git:master: New Docbook processing system.

by Jan Janak

Module: sip-router Branch: master Commit: 5bc53be47a8c33a5b135154e3a6da8834df1914f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5bc53be… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Apr 24 02:13:45 2009 +0200 New Docbook processing system. This is the new and improved version of the docbook build system that was present in ser and kamailio. It consists of Makefiles, xslt stylesheets, css stylesheets, and other auxiliary files that are needed to convert documentation stored in docbook xml format to various output formats. We currently support the following outputs: HTML, plain-text, and module README. Other formats (man pages, chunked HTML and possibly PDF) will be added later. First of all, we are moving all files that are part of the docbook processing system into one directory "docbook". Those files were previously scaterred across multiple directories in the repository and having them all at one place make the system less error-prone. We have merged files containing SGML entity definitions from both projects into a single file. The file is stored in docbook/entities.xml and this is the file that should be included by all docbook documents (we will need to update all such files in all modules). The Kamailio CSS style sheet for module documentation is now becoming the main CSS stylesheet for HTML documentation generated from docbook sources. The new stylesheet is stored in docbook/sr-doc.css. The contents of the file was slighlty updated to make sure that the styles in the file match HTML elements in XHTML output. With the new system the default output HTML flavor is XHTML. The toplevel Makefile.doc is gone. It is being replaced by file docbook/Makefile. The new makefile has been extensively polished and improved. This also requires new Makefiles in modules. All the targets and references that were used to generate the PDF output in SER are gone, we were using proprietary FOP processor which is not generally available. All configuration options that can be overriden from module/doc Makefiles are extensively commented. The new Makefile can save the output being generated into a directory specified on the command line: $ output_dir=/html make html The default target of the Makefile is HTML. There is a new target that can be used generate module README: $ make readme The file that should be included from module Makefiles is docbook/Makefile.modules. At present the file only includes the main Makefile, but in the future some of the targets that are particular to module documentation will be moved to this file. The XML catalog received a small facelift, too. By default the catalog references /etc/xml/catalog. References to dbschema DTD and XSL files (dbschema is the scripting system used to generate SQL files in SER) are gone. They do not belong into this file. All references to Drupal and drupal related xsl stylesheets are gone. Those files were used to generate HTML files suitable for inclusion into Drupal pages at iptel.org. File doc/kam_module_faq.xml has also been removed, this file was empty, it was probably added because it was included by far too many docbook documents in modules. Since I wrote a script to do some compatibility changes in module docbook files, I taught it to remove the reference to the file from all docbook files and then deleted the file. All files in directory "docbook" are briefly described in docbook/README. The new system adopted Kamailio costumizations of the docbook stylesheet that is used to generate READMEs. There is a new stylesheet called readme.xsl that contains all options that should only be applied when READMEs are being generated. The stylesheet that generates man pages from docbook has been moved from doc/stylesheets to docbook/man.xsl. We do not have yet support for man pages in the docbook Makefile, this feature will be added later. New features: * Automatic dependency calculation. We have a XSL stylesheet which traverses the source docbook document and produces a list of files included in the document. This list is then included in the main Makefile to calculate dependencies. That means you can split your document into multiple files and the system will always correctly rebuild the file. * Support for document inclusion with xi:include. All source docbook files are processed with the support for xi:include enabled which makes it possible to include other documents without the need to use SGML entities to include external files. * Improved top level make file, among other things the makefile is now much more flexible, the module can specify different source document for each type of produced output. The makefile can generate module READMEs. The output directory is configurable, which is useful if you need to build a collection of html pages to be uploaded to a server. * Separate stylesheet to customize the format of module README files. * Supported output formats: README XHTML (single file) XHTML (multiple files) Plain-text * Normalized screens: There is no longer the need to pay attention to the leading and trailing white space in data of <screen> (and similar) elements. Stylesheet common.xsl contains a template that does that automatically (this isn't really a new feature, is was present in the original ser docbook processing system). --- Makefile.doc | 188 ------------------- doc/catalog.xml | 53 ------ doc/ser_entities.xml | 48 ----- doc/stylesheets/README | 53 ------ doc/stylesheets/dep.xsl | 44 ----- doc/stylesheets/drupal.xsl | 163 ----------------- doc/stylesheets/fo.xsl | 16 -- doc/stylesheets/html.chunked.xsl | 40 ---- doc/stylesheets/ser.css | 192 ------------------- docbook/Makefile | 193 ++++++++++++++++++++ docbook/Makefile.module | 4 + docbook/README | 66 +++++++ docbook/TODO | 10 + docbook/catalog.xml | 37 ++++ {doc/stylesheets => docbook}/common.xsl | 0 docbook/dep.xsl | 48 +++++ doc/kam_entities.xml => docbook/entities.xml | 16 ++- .../xhtml.chunked.xsl => docbook/html.chunked.xsl | 2 +- .../xhtml.common.xsl => docbook/html.common.xsl | 14 ++- doc/stylesheets/xhtml.xsl => docbook/html.xsl | 3 +- doc/stylesheets/serdoc2man.xsl => docbook/man.xsl | 0 docbook/readme.xsl | 14 ++ doc/kam-module-docbook.css => docbook/sr-doc.css | 77 ++++---- {doc/stylesheets => docbook}/txt.xsl | 2 +- 24 files changed, 441 insertions(+), 842 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5bc…

15 years, 8 months

git:master: Updating docbook sources for the new processing system.

by Jan Janak

Module: sip-router Branch: master Commit: 33d03d8dadcd89997c6c7ade2ea2d43671f92d0c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33d03d8… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Apr 24 03:18:58 2009 +0200 Updating docbook sources for the new processing system. All files now use xi:include to include external files, this mechanism replaces the entity based inclusion mechanism. It is no longer necessary to define a new SGML entity to include an external file. External XML files can be included with: <xi:include href="filename.xml"/> External data files (i.e. files that should not be parsed by the XML parser) can be included with: <xi:include href="cfg_file.txt" parse="text"/> The toplevel element of all docbook documents that use the inclusion mechanism described above must have the following attribute: xmlns:xi="http://www.w3.org/2001/XIinclude" XML files included with XInclude must be complete, that means we need to add the XML header and DOCTYPE to all documents that did not have such header before (typically docbook files included into other docbook files). And finally, all files include the merged entity file in docbok/entities.xml, this file contains SGML entities from both SER and kamailio. --- modules/auth_radius/doc/auth_radius.xml | 11 +--- modules/auth_radius/doc/auth_radius_admin.xml | 10 +++- modules/carrierroute/doc/carrierroute.xml | 18 ++----- modules/carrierroute/doc/carrierroute_admin.xml | 9 +++- modules/carrierroute/doc/carrierroute_db.xml | 9 +++ modules/db_berkeley/doc/db_berkeley.xml | 12 +--- modules/db_berkeley/doc/db_berkeley_admin.xml | 10 +++- modules/db_berkeley/km_doc/db_berkeley.xml | 14 ++---- modules/db_berkeley/km_doc/db_berkeley_admin.xml | 10 +++- modules/db_flatstore/km_doc/db_flatstore.xml | 15 ++---- modules/db_flatstore/km_doc/db_flatstore_admin.xml | 10 ++++ modules/db_flatstore/km_doc/db_flatstore_devel.xml | 10 ++++ modules/db_mysql/km_doc/db_mysql.xml | 12 +--- modules/db_mysql/km_doc/db_mysql_admin.xml | 10 ++++ modules/db_postgres/km_doc/db_postgres.xml | 14 ++---- modules/db_postgres/km_doc/db_postgres_admin.xml | 10 ++++ modules/dialplan/doc/dialplan.xml | 15 ++---- modules/dialplan/doc/dialplan_admin.xml | 10 ++++ modules/dialplan/doc/dialplan_devel.xml | 10 ++++ modules/enum/doc/enum.xml | 11 +--- modules/enum/doc/enum_admin.xml | 10 ++++ modules/mediaproxy/doc/mediaproxy.xml | 11 +--- modules/mediaproxy/doc/mediaproxy_admin.xml | 10 ++++ modules/misc_radius/doc/misc_radius.xml | 11 +--- modules/misc_radius/doc/misc_radius_admin.xml | 11 ++++ modules/peering/doc/peering.xml | 12 ++--- modules/peering/doc/peering_admin.xml | 10 ++++ modules_k/acc/doc/acc.xml | 12 ++--- modules_k/acc/doc/acc_admin.xml | 10 ++++ modules_k/acc/doc/acc_faq.xml | 10 ++++ modules_k/alias_db/doc/alias_db.xml | 12 +--- modules_k/alias_db/doc/alias_db_admin.xml | 10 ++++ modules_k/auth/doc/auth.xml | 10 +--- modules_k/auth/doc/auth_admin.xml | 10 ++++ modules_k/auth_db/doc/auth_db.xml | 12 ++--- modules_k/auth_db/doc/auth_db_admin.xml | 10 ++++ modules_k/auth_diameter/doc/auth_diameter.xml | 11 +--- .../auth_diameter/doc/auth_diameter_admin.xml | 10 ++++ modules_k/avpops/doc/avpops.xml | 11 +--- modules_k/avpops/doc/avpops_admin.xml | 10 ++++ modules_k/benchmark/doc/benchmark.xml | 15 ++---- modules_k/benchmark/doc/benchmark_admin.xml | 10 ++++ modules_k/benchmark/doc/benchmark_devel.xml | 10 ++++ modules_k/cfgutils/doc/cfgutils.xml | 12 ++--- modules_k/cfgutils/doc/cfgutils_admin.xml | 10 ++++ modules_k/cpl-c/doc/cpl-c.xml | 11 +--- modules_k/cpl-c/doc/cpl-c_admin.xml | 10 ++++ modules_k/db_oracle/doc/db_oracle.xml | 12 ++--- modules_k/db_oracle/doc/db_oracle_admin.xml | 9 +++ modules_k/db_text/doc/db_text.xml | 16 ++---- modules_k/db_text/doc/db_text_admin.xml | 14 ++++- modules_k/db_text/doc/db_text_devel.xml | 10 ++++ modules_k/db_unixodbc/doc/db_unixodbc.xml | 15 ++---- modules_k/db_unixodbc/doc/db_unixodbc_admin.xml | 9 +++ modules_k/db_unixodbc/doc/db_unixodbc_devel.xml | 9 +++ modules_k/dialog/doc/dialog.xml | 15 ++---- modules_k/dialog/doc/dialog_admin.xml | 9 +++ modules_k/dialog/doc/dialog_devel.xml | 9 +++ modules_k/dialog/doc/dialog_faq.xml | 10 ++++ modules_k/dispatcher/doc/dispatcher.xml | 14 ++---- modules_k/dispatcher/doc/dispatcher_admin.xml | 15 ++++- modules_k/dispatcher/doc/dispatcher_faq.xml | 9 +++ modules_k/diversion/doc/diversion.xml | 15 ++---- modules_k/diversion/doc/diversion_admin.xml | 11 ++++- modules_k/diversion/doc/diversion_devel.xml | 9 +++ modules_k/domain/doc/domain.xml | 14 ++--- modules_k/domain/doc/domain_admin.xml | 9 +++ modules_k/domain/doc/domain_devel.xml | 10 ++++ modules_k/domainpolicy/doc/domainpolicy.xml | 11 ++--- modules_k/domainpolicy/doc/domainpolicy_admin.xml | 58 ++++---------------- modules_k/exec/doc/exec.xml | 12 ++--- modules_k/exec/doc/exec_admin.xml | 9 +++ modules_k/group/doc/group.xml | 8 ++-- modules_k/group/doc/group_admin.xml | 9 +++ modules_k/h350/doc/h350.xml | 13 ++--- modules_k/h350/doc/h350_admin.xml | 9 +++ modules_k/h350/doc/h350_biblio.xml | 10 +++- modules_k/htable/doc/htable.xml | 12 ++--- modules_k/htable/doc/htable_admin.xml | 9 +++ modules_k/imc/doc/imc.xml | 12 ++--- modules_k/imc/doc/imc_admin.xml | 9 +++ modules_k/jabber/doc/jabber.xml | 11 ++--- modules_k/jabber/doc/jabber_admin.xml | 9 +++ modules_k/kex/doc/kex.xml | 12 ++--- modules_k/kex/doc/kex_admin.xml | 9 +++ modules_k/lcr/doc/lcr.xml | 11 ++--- modules_k/lcr/doc/lcr_admin.xml | 9 +++ modules_k/ldap/doc/ldap.xml | 16 ++---- modules_k/ldap/doc/ldap_admin.xml | 9 +++ modules_k/ldap/doc/ldap_biblio.xml | 9 +++ modules_k/ldap/doc/ldap_devel.xml | 9 +++ modules_k/maxfwd/doc/maxfwd.xml | 12 ++--- modules_k/maxfwd/doc/maxfwd_admin.xml | 9 +++ modules_k/memcached/doc/memcached.xml | 12 ++--- modules_k/memcached/doc/memcached_admin.xml | 9 +++ modules_k/mi_datagram/doc/mi_datagram.xml | 12 ++--- modules_k/mi_datagram/doc/mi_datagram_admin.xml | 9 +++ modules_k/mi_datagram/doc/mi_datagram_faq.xml | 9 +++ modules_k/mi_fifo/doc/mi_fifo.xml | 12 ++--- modules_k/mi_fifo/doc/mi_fifo_admin.xml | 9 +++ modules_k/mi_xmlrpc/doc/mi_xmlrpc.xml | 12 ++--- modules_k/mi_xmlrpc/doc/mi_xmlrpc_admin.xml | 9 +++ modules_k/msilo/doc/msilo.xml | 13 ++--- modules_k/msilo/doc/msilo_admin.xml | 13 ++++- modules_k/nat_traversal/doc/nat_traversal.xml | 11 ++--- .../nat_traversal/doc/nat_traversal_admin.xml | 9 +++ modules_k/nathelper/doc/nathelper.xml | 12 ++--- modules_k/nathelper/doc/nathelper_admin.xml | 10 ++++ modules_k/nathelper/doc/nathelper_faq.xml | 9 +++ modules_k/osp/doc/osp.xml | 14 ++--- modules_k/osp/doc/osp_admin.xml | 9 +++ modules_k/osp/doc/osp_devel.xml | 9 +++ modules_k/path/doc/path.xml | 12 ++--- modules_k/path/doc/path_admin.xml | 9 +++ modules_k/pdt/doc/pdt.xml | 12 ++--- modules_k/pdt/doc/pdt_admin.xml | 9 +++ modules_k/perl/doc/perl.xml | 18 ++---- modules_k/perl/doc/perl_admin.xml | 9 +++ modules_k/perl/doc/perl_faq.xml | 9 +++ modules_k/perl/doc/perl_pod.xml | 9 +++ modules_k/perl/doc/perl_samples.xml | 9 +++ modules_k/perlvdb/doc/perlvdb.xml | 15 ++---- modules_k/perlvdb/doc/perlvdb_admin.xml | 9 +++ modules_k/perlvdb/doc/perlvdb_devel.xml | 9 +++ modules_k/permissions/doc/permissions.xml | 12 ++--- modules_k/permissions/doc/permissions_admin.xml | 9 +++ modules_k/pike/doc/pike.xml | 15 ++---- modules_k/pike/doc/pike_admin.xml | 9 +++ modules_k/pike/doc/pike_devel.xml | 9 +++ modules_k/presence/doc/presence.xml | 11 ++--- modules_k/presence/doc/presence_admin.xml | 9 +++ modules_k/presence/doc/presence_devel.xml | 9 +++ .../doc/presence_dialoginfo.xml | 13 ++--- .../doc/presence_dialoginfo_admin.xml | 9 +++ modules_k/presence_mwi/doc/presence_mwi.xml | 13 ++--- modules_k/presence_mwi/doc/presence_mwi_admin.xml | 9 +++ modules_k/presence_xml/doc/presence_xml.xml | 15 ++---- modules_k/presence_xml/doc/presence_xml_admin.xml | 9 +++ modules_k/presence_xml/doc/presence_xml_devel.xml | 9 +++ modules_k/pua/doc/pua.xml | 15 ++---- modules_k/pua/doc/pua_admin.xml | 9 +++ modules_k/pua/doc/pua_devel.xml | 9 +++ modules_k/pua_bla/doc/pua_bla.xml | 12 ++--- modules_k/pua_bla/doc/pua_bla_admin.xml | 9 +++ modules_k/pua_dialoginfo/doc/pua_dialoginfo.xml | 12 ++--- .../pua_dialoginfo/doc/pua_dialoginfo_admin.xml | 9 +++ modules_k/pua_mi/doc/pua_mi.xml | 12 ++--- modules_k/pua_mi/doc/pua_mi_admin.xml | 9 +++ modules_k/pua_usrloc/doc/pua_usrloc.xml | 12 ++--- modules_k/pua_usrloc/doc/pua_usrloc_admin.xml | 9 +++ modules_k/pua_xmpp/doc/pua_xmpp.xml | 16 ++---- modules_k/pua_xmpp/doc/pua_xmpp_admin.xml | 9 +++ modules_k/pua_xmpp/doc/pua_xmpp_devel.xml | 9 +++ modules_k/purple/doc/purple.xml | 12 ++--- modules_k/purple/doc/purple_admin.xml | 9 +++ modules_k/pv/doc/pv.xml | 12 ++--- modules_k/pv/doc/pv_admin.xml | 9 +++ modules_k/qos/doc/qos.xml | 14 ++--- modules_k/qos/doc/qos_admin.xml | 9 +++ modules_k/qos/doc/qos_devel.xml | 9 +++ modules_k/ratelimit/doc/ratelimit.xml | 12 ++--- modules_k/ratelimit/doc/ratelimit_admin.xml | 9 +++ modules_k/regex/doc/regex.xml | 12 ++--- modules_k/regex/doc/regex_admin.xml | 9 +++ modules_k/registrar/doc/registrar.xml | 12 ++--- modules_k/registrar/doc/registrar_admin.xml | 9 +++ modules_k/registrar/doc/registrar_faq.xml | 9 +++ modules_k/rls/doc/rls.xml | 15 ++---- modules_k/rls/doc/rls_admin.xml | 9 +++ modules_k/rls/doc/rls_devel.xml | 9 +++ modules_k/rr/doc/rr.xml | 15 ++---- modules_k/rr/doc/rr_admin.xml | 9 +++ modules_k/rr/doc/rr_devel.xml | 9 +++ modules_k/rtimer/doc/rtimer.xml | 12 ++--- modules_k/rtimer/doc/rtimer_admin.xml | 9 +++ modules_k/sanity/doc/sanity.xml | 12 ++--- modules_k/sanity/doc/sanity_admin.xml | 9 +++ modules_k/seas/doc/seas.xml | 14 ++--- modules_k/seas/doc/seas_admin.xml | 11 ++++- modules_k/seas/doc/seas_devel.xml | 37 ++++++++----- modules_k/siptrace/doc/siptrace.xml | 14 ++---- modules_k/siptrace/doc/siptrace_admin.xml | 9 +++ modules_k/siputils/doc/siputils.xml | 12 ++--- modules_k/siputils/doc/siputils_admin.xml | 9 +++ modules_k/sl/doc/sl.xml | 12 ++--- modules_k/sl/doc/sl_admin.xml | 9 +++ modules_k/sms/doc/sms.xml | 15 ++---- modules_k/sms/doc/sms_admin.xml | 9 +++ modules_k/sms/doc/sms_devel.xml | 9 +++ modules_k/snmpstats/doc/snmpstats.xml | 11 ++--- modules_k/snmpstats/doc/snmpstats_admin.xml | 9 +++ modules_k/snmpstats/doc/snmpstats_faq.xml | 9 +++ modules_k/speeddial/doc/speeddial.xml | 15 ++---- modules_k/speeddial/doc/speeddial_admin.xml | 13 ++++- modules_k/sqlops/doc/sqlops.xml | 12 ++--- modules_k/sqlops/doc/sqlops_admin.xml | 9 +++ modules_k/sst/doc/sst.xml | 11 ++--- modules_k/sst/doc/sst_admin.xml | 9 +++ modules_k/statistics/doc/statistics.xml | 12 ++--- modules_k/statistics/doc/statistics_admin.xml | 9 +++ modules_k/textops/doc/textops.xml | 15 ++---- modules_k/textops/doc/textops_admin.xml | 9 +++ modules_k/textops/doc/textops_devel.xml | 9 +++ modules_k/uac/doc/uac.xml | 12 ++--- modules_k/uac/doc/uac_admin.xml | 9 +++ modules_k/uac_redirect/doc/uac_redirect.xml | 12 ++--- modules_k/uac_redirect/doc/uac_redirect_admin.xml | 9 +++ modules_k/uri_db/doc/uri_db.xml | 12 ++--- modules_k/uri_db/doc/uri_db_admin.xml | 9 +++ modules_k/userblacklist/doc/userblacklist.xml | 14 ++--- .../userblacklist/doc/userblacklist_admin.xml | 9 +++ modules_k/userblacklist/doc/userblacklist_db.xml | 9 +++ modules_k/usrloc/doc/usrloc.xml | 15 ++---- modules_k/usrloc/doc/usrloc_admin.xml | 9 +++ modules_k/usrloc/doc/usrloc_devel.xml | 9 +++ modules_k/utils/doc/utils.xml | 12 ++--- modules_k/utils/doc/utils_admin.xml | 9 +++ modules_k/xcap_client/doc/xcap_client.xml | 15 ++---- modules_k/xcap_client/doc/xcap_client_admin.xml | 9 +++ modules_k/xcap_client/doc/xcap_client_devel.xml | 9 +++ modules_k/xlog/doc/xlog.xml | 12 ++--- modules_k/xlog/doc/xlog_admin.xml | 9 +++ modules_k/xmpp/doc/xmpp.xml | 13 ++--- modules_k/xmpp/doc/xmpp_admin.xml | 13 ++++- modules_s/osp/doc/osp.xml | 2 +- 225 files changed, 1619 insertions(+), 890 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=33d…

15 years, 8 months

git:master: New makefiles for module documentation

by Jan Janak

Module: sip-router Branch: master Commit: 37979b9491c9bd2f9e2abb06d839e55242f08187 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37979b9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Apr 24 03:09:32 2009 +0200 New makefiles for module documentation The new docbook processing system needs new makefiles in directories with docbook documentation. --- modules/auth_radius/doc/Makefile | 4 ++++ modules/carrierroute/doc/Makefile | 4 ++++ modules/db_berkeley/doc/Makefile | 4 ++++ modules/db_berkeley/km_doc/Makefile | 4 ++++ modules/db_flatstore/doc/Makefile | 31 +++---------------------------- modules/db_flatstore/km_doc/Makefile | 4 ++++ modules/db_mysql/doc/Makefile | 4 ++++ modules/db_mysql/km_doc/Makefile | 4 ++++ modules/db_postgres/km_doc/Makefile | 4 ++++ modules/dialplan/doc/Makefile | 4 ++++ modules/enum/doc/Makefile | 4 ++++ modules/mediaproxy/doc/Makefile | 4 ++++ modules/misc_radius/doc/Makefile | 4 ++++ modules/peering/doc/Makefile | 4 ++++ modules/tls/doc/Makefile | 31 +++---------------------------- modules/tm/doc/Makefile | 31 +++---------------------------- 16 files changed, 61 insertions(+), 84 deletions(-) diff --git a/modules/auth_radius/doc/Makefile b/modules/auth_radius/doc/Makefile new file mode 100644 index 0000000..af5de1f --- /dev/null +++ b/modules/auth_radius/doc/Makefile @@ -0,0 +1,4 @@ +docs = auth_radius.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/carrierroute/doc/Makefile b/modules/carrierroute/doc/Makefile new file mode 100644 index 0000000..96bd20f --- /dev/null +++ b/modules/carrierroute/doc/Makefile @@ -0,0 +1,4 @@ +docs = carrierroute.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/db_berkeley/doc/Makefile b/modules/db_berkeley/doc/Makefile new file mode 100644 index 0000000..64944ad --- /dev/null +++ b/modules/db_berkeley/doc/Makefile @@ -0,0 +1,4 @@ +docs = db_berkeley.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/db_berkeley/km_doc/Makefile b/modules/db_berkeley/km_doc/Makefile new file mode 100644 index 0000000..ccfa0af --- /dev/null +++ b/modules/db_berkeley/km_doc/Makefile @@ -0,0 +1,4 @@ +docs = db_berkeley.xml + +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/db_flatstore/doc/Makefile b/modules/db_flatstore/doc/Makefile index 28b668f..e45b9e0 100644 --- a/modules/db_flatstore/doc/Makefile +++ b/modules/db_flatstore/doc/Makefile @@ -1,29 +1,4 @@ -# -# The list of documents to build (without extensions) -# -DOCUMENTS = flatstore +docs = db_flatstore.xml -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) - -include $(ROOT_DIR)/Makefile.doc +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/db_flatstore/km_doc/Makefile b/modules/db_flatstore/km_doc/Makefile new file mode 100644 index 0000000..e45b9e0 --- /dev/null +++ b/modules/db_flatstore/km_doc/Makefile @@ -0,0 +1,4 @@ +docs = db_flatstore.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/db_mysql/doc/Makefile b/modules/db_mysql/doc/Makefile new file mode 100644 index 0000000..7303b01 --- /dev/null +++ b/modules/db_mysql/doc/Makefile @@ -0,0 +1,4 @@ +docs = db_mysql.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/db_mysql/km_doc/Makefile b/modules/db_mysql/km_doc/Makefile new file mode 100644 index 0000000..7303b01 --- /dev/null +++ b/modules/db_mysql/km_doc/Makefile @@ -0,0 +1,4 @@ +docs = db_mysql.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/db_postgres/km_doc/Makefile b/modules/db_postgres/km_doc/Makefile new file mode 100644 index 0000000..e132056 --- /dev/null +++ b/modules/db_postgres/km_doc/Makefile @@ -0,0 +1,4 @@ +docs = db_postgres.xml + +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/dialplan/doc/Makefile b/modules/dialplan/doc/Makefile new file mode 100644 index 0000000..ce7ac91 --- /dev/null +++ b/modules/dialplan/doc/Makefile @@ -0,0 +1,4 @@ +docs = dialplan.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/enum/doc/Makefile b/modules/enum/doc/Makefile new file mode 100644 index 0000000..c762f58 --- /dev/null +++ b/modules/enum/doc/Makefile @@ -0,0 +1,4 @@ +docs = enum.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/mediaproxy/doc/Makefile b/modules/mediaproxy/doc/Makefile new file mode 100644 index 0000000..721ad72 --- /dev/null +++ b/modules/mediaproxy/doc/Makefile @@ -0,0 +1,4 @@ +docs = mediaproxy.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/misc_radius/doc/Makefile b/modules/misc_radius/doc/Makefile new file mode 100644 index 0000000..f50fbb5 --- /dev/null +++ b/modules/misc_radius/doc/Makefile @@ -0,0 +1,4 @@ +docs = misc_radius.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/peering/doc/Makefile b/modules/peering/doc/Makefile new file mode 100644 index 0000000..91af3d4 --- /dev/null +++ b/modules/peering/doc/Makefile @@ -0,0 +1,4 @@ +docs = peering.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/tls/doc/Makefile b/modules/tls/doc/Makefile index 3170faa..d17195a 100644 --- a/modules/tls/doc/Makefile +++ b/modules/tls/doc/Makefile @@ -1,29 +1,4 @@ -# -# The list of documents to build (without extensions) -# -DOCUMENTS = tls +docs = tls.xml -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) - -include $(ROOT_DIR)/Makefile.doc +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/tm/doc/Makefile b/modules/tm/doc/Makefile index 06495a8..85f7396 100644 --- a/modules/tm/doc/Makefile +++ b/modules/tm/doc/Makefile @@ -1,29 +1,4 @@ -# -# The list of documents to build (without extensions) -# -DOCUMENTS = tm +docs = tm.xml -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) - -include $(ROOT_DIR)/Makefile.doc +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module

15 years, 8 months

git:master: New makefiles for module documentation in k. modules

by Jan Janak

Module: sip-router Branch: master Commit: c04b411ce79f59e683d4a7db4191fad1e436fac0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c04b411… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Apr 24 03:13:30 2009 +0200 New makefiles for module documentation in k. modules The new docbook processing system needs new makefiles in directories with docbook documentation. --- modules_k/acc/doc/Makefile | 42 ++-------------------------- modules_k/alias_db/doc/Makefile | 42 ++-------------------------- modules_k/auth/doc/Makefile | 42 ++-------------------------- modules_k/auth_db/doc/Makefile | 4 ++ modules_k/auth_diameter/doc/Makefile | 4 ++ modules_k/avpops/doc/Makefile | 4 ++ modules_k/benchmark/doc/Makefile | 4 ++ modules_k/cfgutils/doc/Makefile | 4 ++ modules_k/cpl-c/doc/Makefile | 4 ++ modules_k/db_oracle/doc/Makefile | 4 ++ modules_k/db_text/doc/Makefile | 4 ++ modules_k/db_unixodbc/doc/Makefile | 4 ++ modules_k/dialog/doc/Makefile | 4 ++ modules_k/dispatcher/doc/Makefile | 42 ++-------------------------- modules_k/diversion/doc/Makefile | 4 ++ modules_k/domain/doc/Makefile | 4 ++ modules_k/domainpolicy/doc/Makefile | 4 ++ modules_k/exec/doc/Makefile | 4 ++ modules_k/group/doc/Makefile | 4 ++ modules_k/h350/doc/Makefile | 4 ++ modules_k/htable/doc/Makefile | 4 ++ modules_k/imc/doc/Makefile | 4 ++ modules_k/jabber/doc/Makefile | 4 ++ modules_k/kex/doc/Makefile | 4 ++ modules_k/lcr/doc/Makefile | 4 ++ modules_k/ldap/doc/Makefile | 4 ++ modules_k/maxfwd/doc/Makefile | 4 ++ modules_k/memcached/doc/Makefile | 4 ++ modules_k/mi_datagram/doc/Makefile | 4 ++ modules_k/mi_fifo/doc/Makefile | 4 ++ modules_k/mi_xmlrpc/doc/Makefile | 4 ++ modules_k/msilo/doc/Makefile | 4 ++ modules_k/nat_traversal/doc/Makefile | 4 ++ modules_k/nathelper/doc/Makefile | 4 ++ modules_k/osp/doc/Makefile | 4 ++ modules_k/path/doc/Makefile | 4 ++ modules_k/pdt/doc/Makefile | 4 ++ modules_k/perl/doc/Makefile | 4 ++ modules_k/perlvdb/doc/Makefile | 4 ++ modules_k/permissions/doc/Makefile | 4 ++ modules_k/pike/doc/Makefile | 4 ++ modules_k/presence/doc/Makefile | 4 ++ modules_k/presence_dialoginfo/doc/Makefile | 4 ++ modules_k/presence_mwi/doc/Makefile | 4 ++ modules_k/presence_xml/doc/Makefile | 4 ++ modules_k/pua/doc/Makefile | 4 ++ modules_k/pua_bla/doc/Makefile | 4 ++ modules_k/pua_dialoginfo/doc/Makefile | 4 ++ modules_k/pua_mi/doc/Makefile | 4 ++ modules_k/pua_usrloc/doc/Makefile | 4 ++ modules_k/pua_xmpp/doc/Makefile | 4 ++ modules_k/purple/doc/Makefile | 4 ++ modules_k/pv/doc/Makefile | 4 ++ modules_k/qos/doc/Makefile | 4 ++ modules_k/ratelimit/doc/Makefile | 4 ++ modules_k/regex/doc/Makefile | 4 ++ modules_k/registrar/doc/Makefile | 4 ++ modules_k/rls/doc/Makefile | 4 ++ modules_k/rr/doc/Makefile | 4 ++ modules_k/rtimer/doc/Makefile | 4 ++ modules_k/sanity/doc/Makefile | 4 ++ modules_k/seas/doc/Makefile | 4 ++ modules_k/siptrace/doc/Makefile | 4 ++ modules_k/siputils/doc/Makefile | 4 ++ modules_k/sl/doc/Makefile | 4 ++ modules_k/sms/doc/Makefile | 4 ++ modules_k/snmpstats/doc/Makefile | 4 ++ modules_k/speeddial/doc/Makefile | 4 ++ modules_k/sqlops/doc/Makefile | 4 ++ modules_k/sst/doc/Makefile | 4 ++ modules_k/statistics/doc/Makefile | 4 ++ modules_k/textops/doc/Makefile | 4 ++ modules_k/uac/doc/Makefile | 4 ++ modules_k/uac_redirect/doc/Makefile | 4 ++ modules_k/uri_db/doc/Makefile | 4 ++ modules_k/userblacklist/doc/Makefile | 4 ++ modules_k/usrloc/doc/Makefile | 4 ++ modules_k/utils/doc/Makefile | 4 ++ modules_k/xcap_client/doc/Makefile | 4 ++ modules_k/xlog/doc/Makefile | 4 ++ modules_k/xmpp/doc/Makefile | 4 ++ 81 files changed, 320 insertions(+), 156 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c04…

15 years, 8 months

git:master: New makefiles for module documentation of ser modules

by Jan Janak

Module: sip-router Branch: master Commit: 18062708802467b6406effea4d6faff469c5aa5e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1806270… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Apr 24 03:15:21 2009 +0200 New makefiles for module documentation of ser modules The new docbook processing system needs new makefiles in directories with docbook documentation. --- modules_s/acc_syslog/doc/Makefile | 31 ++---------------- modules_s/auth/doc/Makefile | 31 ++---------------- modules_s/auth_db/doc/Makefile | 31 ++---------------- modules_s/auth_identity/doc/Makefile | 31 ++---------------- modules_s/avp/doc/Makefile | 31 ++---------------- modules_s/avp_db/doc/Makefile | 31 ++---------------- modules_s/avpops/doc/Makefile | 31 ++---------------- modules_s/bdb/doc/Makefile | 31 ++---------------- modules_s/blst/doc/Makefile | 31 ++---------------- modules_s/cfg_db/doc/Makefile | 31 ++---------------- modules_s/cfg_rpc/doc/Makefile | 31 ++---------------- modules_s/cpl-c/doc/Makefile | 31 ++---------------- modules_s/db_ops/doc/Makefile | 31 ++---------------- modules_s/dbg/doc/Makefile | 31 ++---------------- modules_s/dbtext/doc/Makefile | 31 ++---------------- modules_s/dispatcher/doc/Makefile | 31 ++---------------- modules_s/domain/doc/Makefile | 31 ++---------------- modules_s/exec/doc/Makefile | 31 ++---------------- modules_s/gflags/doc/Makefile | 31 ++---------------- modules_s/iptrtpproxy/doc/Makefile | 31 ++---------------- modules_s/jabber/doc/Makefile | 31 ++---------------- modules_s/lcr/doc/Makefile | 31 ++---------------- modules_s/ldap/doc/Makefile | 31 ++---------------- modules_s/mangler/doc/Makefile | 31 ++---------------- modules_s/maxfwd/doc/Makefile | 31 ++---------------- modules_s/msilo/doc/Makefile | 31 ++---------------- modules_s/nathelper/doc/Makefile | 31 ++---------------- modules_s/options/doc/Makefile | 31 ++---------------- modules_s/osp/doc/Makefile | 31 ++---------------- modules_s/pa/doc/Makefile | 60 ++-------------------------------- modules_s/pdt/doc/Makefile | 31 ++---------------- modules_s/permissions/doc/Makefile | 31 ++---------------- modules_s/pike/doc/Makefile | 31 ++---------------- modules_s/presence_b2b/doc/Makefile | 31 ++---------------- modules_s/print/doc/Makefile | 31 ++---------------- modules_s/ratelimit/doc/Makefile | 31 ++---------------- modules_s/registrar/doc/Makefile | 31 ++---------------- modules_s/rls/doc/Makefile | 31 ++---------------- modules_s/rr/doc/Makefile | 31 ++---------------- modules_s/sanity/doc/Makefile | 31 ++---------------- modules_s/sl/doc/Makefile | 31 ++---------------- modules_s/sms/doc/Makefile | 31 ++---------------- modules_s/speeddial/doc/Makefile | 31 ++---------------- modules_s/textops/doc/Makefile | 31 ++---------------- modules_s/timer/doc/Makefile | 31 ++---------------- modules_s/tls/doc/Makefile | 31 ++---------------- modules_s/uac/doc/Makefile | 31 ++---------------- modules_s/uri/doc/Makefile | 31 ++---------------- modules_s/uri_db/doc/Makefile | 31 ++---------------- modules_s/usrloc/doc/Makefile | 31 ++---------------- modules_s/xcap/doc/Makefile | 31 ++---------------- modules_s/xlog/doc/Makefile | 31 ++---------------- 52 files changed, 156 insertions(+), 1485 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=180…

15 years, 8 months

git:master: Removing postgres module from modules_s

by Jan Janak

Module: sip-router Branch: master Commit: 92414af97afb0f7652209b28e506f83ad01ba76c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92414af… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Apr 24 01:25:01 2009 +0200 Removing postgres module from modules_s The module has already been merged with kamailio db_postgres and the new module is in modules directory --- modules_s/postgres/Makefile | 21 - modules_s/postgres/README | 134 ------ modules_s/postgres/pg_cmd.c | 516 ------------------------ modules_s/postgres/pg_cmd.h | 155 ------- modules_s/postgres/pg_con.c | 326 --------------- modules_s/postgres/pg_con.h | 104 ----- modules_s/postgres/pg_fld.c | 933 ------------------------------------------- modules_s/postgres/pg_fld.h | 148 ------- modules_s/postgres/pg_mod.c | 544 ------------------------- modules_s/postgres/pg_mod.h | 47 --- modules_s/postgres/pg_oid.c | 184 --------- modules_s/postgres/pg_oid.h | 128 ------ modules_s/postgres/pg_res.c | 76 ---- modules_s/postgres/pg_res.h | 58 --- modules_s/postgres/pg_sql.c | 424 -------------------- modules_s/postgres/pg_sql.h | 118 ------ modules_s/postgres/pg_uri.c | 298 -------------- modules_s/postgres/pg_uri.h | 71 ---- 18 files changed, 0 insertions(+), 4285 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=924…

15 years, 8 months

git:master: Removing flatstore module from modules_s

by Jan Janak

Module: sip-router Branch: master Commit: 1b7b3f92c502ebea91a1a36356dc4aada751de0e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b7b3f9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Apr 24 01:25:33 2009 +0200 Removing flatstore module from modules_s The module has already been merged with kamailio db_flatstore and the new module is in modules directory --- modules_s/flatstore/Makefile | 14 -- modules_s/flatstore/README | 95 ----------- modules_s/flatstore/doc/Makefile | 29 ---- modules_s/flatstore/doc/flatstore.xml | 134 --------------- modules_s/flatstore/doc/functions.xml | 17 -- modules_s/flatstore/doc/params.xml | 26 --- modules_s/flatstore/flat_cmd.c | 216 ------------------------ modules_s/flatstore/flat_cmd.h | 75 -------- modules_s/flatstore/flat_con.c | 299 --------------------------------- modules_s/flatstore/flat_con.h | 93 ---------- modules_s/flatstore/flat_rpc.c | 61 ------- modules_s/flatstore/flat_rpc.h | 42 ----- modules_s/flatstore/flat_uri.c | 80 --------- modules_s/flatstore/flat_uri.h | 62 ------- modules_s/flatstore/flatstore_mod.c | 205 ---------------------- modules_s/flatstore/flatstore_mod.h | 51 ------ modules_s/flatstore/ser-flatstore.cfg | 22 --- modules_s/flatstore/todo.txt | 2 - 18 files changed, 0 insertions(+), 1523 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1b7…

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev