sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
199 discussions

git:3.1: utils: fix kamctl start if installed in a custom prefix, tested from Fabian Borot
by Henning Westerholt 06 Jul '11

06 Jul '11

Module: sip-router Branch: 3.1 Commit: ec63ebad94faaf2800aa9738b9da9c25687dfe3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec63eba… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 6 18:26:16 2011 +0200 utils: fix kamctl start if installed in a custom prefix, tested from Fabian Borot (cherry picked from commit 7ca54b8867ca325fd318536e29f8ae8e028611c9) --- utils/kamctl/kamctl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a68093f..d465d67 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1604,9 +1604,9 @@ openser_start() { exit 1 fi if [ $SYSLOG = 1 ] ; then - $OSERBIN -P $PID_FILE $STARTOPTIONS 1>/dev/null 2>/dev/null + $OSERBIN -P $PID_FILE -f $ETCDIR/kamailio.cfg $STARTOPTIONS 1>/dev/null 2>/dev/null else - $OSERBIN -P $PID_FILE -E $STARTOPTIONS + $OSERBIN -P $PID_FILE -E -f $ETCDIR/kamailio.cfg $STARTOPTIONS fi sleep 3 if [ ! -s $PID_FILE ] ; then

1 0

git:master: utils: fix kamctl start if installed in a custom prefix, tested from Fabian Borot
by Henning Westerholt 06 Jul '11

06 Jul '11

Module: sip-router Branch: master Commit: 7ca54b8867ca325fd318536e29f8ae8e028611c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ca54b8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jul 6 18:26:16 2011 +0200 utils: fix kamctl start if installed in a custom prefix, tested from Fabian Borot --- utils/kamctl/kamctl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 4d99f15..8c37a9d 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1610,9 +1610,9 @@ openser_start() { exit 1 fi if [ $SYSLOG = 1 ] ; then - $OSERBIN -P $PID_FILE $STARTOPTIONS 1>/dev/null 2>/dev/null + $OSERBIN -P $PID_FILE -f $ETCDIR/kamailio.cfg $STARTOPTIONS 1>/dev/null 2>/dev/null else - $OSERBIN -P $PID_FILE -E $STARTOPTIONS + $OSERBIN -P $PID_FILE -E -f $ETCDIR/kamailio.cfg $STARTOPTIONS fi sleep 3 if [ ! -s $PID_FILE ] ; then

1 0

[tracker] Comment added: kamailio 3.1.3 Presence + XCAP problem, is it a bug?
by sip-router 06 Jul '11

06 Jul '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#133 - kamailio 3.1.3 Presence + XCAP problem, is it a bug? User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you send the unified diff, ie., taken as: diff -u presence.c.orig presence.c.patch Is it for v3.1.x or devel? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=133#comment235 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: tcp_async=yes breaks connect_timeout (no effect) and TCP reject detection
by sip-router 06 Jul '11

06 Jul '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#136 - tcp_async=yes breaks connect_timeout (no effect) and TCP reject detection User who did this - Iñaki Baz Castillo (ibc) ---------- Comment by Andrei Pelinescu in the devel maillist: Yes, it's a known limitation. Basically when async it's own, tm has no way of knowing that a connect() has failed and would have to rely on sip timeout. Of course these could be changed, but it would have both performance and memory usage impact and it would be very hard to integrate with tls. I would rather not do it in the near future. The tcp_connect_timeout refers to how long the tcp connect will be attempted, but it's not linked to tm. The value is not 100% exact, the tcp timers are executed on a best effort basis, at most at 5s intervals and at minimum 1/16 seconds, so you should expect a 5s error If it's too much for you, change TCP_MAIN_SELECT_TIMEOUT and TCP_CHILD_SELECT_TIMEOUT in tcp_conn.h (btw. we don't use select() anymore, the names where not updated when we switched to epoll/kqueue/dev_poll). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=136#comment234 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

Re: [sr-dev] git:master: core: new preprocessor directives: trydef and redef
by Henning Westerholt 06 Jul '11

06 Jul '11

Daniel wrote: > Module: sip-router > Branch: master > Commit: 13de789c655b2b5da47a9982fe19fef386265dc2 > URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13de789… > > core: new preprocessor directives: trydef and redef > > - #!trydef - don't define if it is already done > - #!redef - redefine even already defined > - both have the prototype like #!define Hello Daniel, looks interesting. :-) Just one question, have you thought about using something like in the C cpp language, instead of adding two more keywords to our grammar? E.g. something like this: - trydef #!ifndef foo #!define foo "bar" - redef #!define foo "bar" # foo == bar #... #!define foo "bar2 # foo == bar2 Best regards, Henning

2 1

git:master: tm: delete obselete uri2sock function, its not compiled since almost 5 years
by Henning Westerholt 06 Jul '11

06 Jul '11

Module: sip-router Branch: master Commit: 71bfc3f3c1b22ff6f06c0b1fcafc4d6a75abd66b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71bfc3f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 5 23:50:10 2011 +0200 tm: delete obselete uri2sock function, its not compiled since almost 5 years --- modules/tm/ut.h | 34 ---------------------------------- 1 files changed, 0 insertions(+), 34 deletions(-) diff --git a/modules/tm/ut.h b/modules/tm/ut.h index 4ca2751..3aa829a 100644 --- a/modules/tm/ut.h +++ b/modules/tm/ut.h @@ -386,38 +386,4 @@ inline static struct dest_info *uri2dst(struct dest_info* dst, } #endif /* USE_DNS_FAILOVER */ - - -#if 0 -/* - * Convert a URI into the corresponding sockaddr_union (address to send to) and - * send socket_info (socket/address from which to send) - * to_su is filled with the destination and the socket_info that will be - * used for sending is returned. - * On error return 0. - * - * NOTE: this function is deprecated, you should use uri2dst instead - */ -static inline struct socket_info *uri2sock(struct sip_msg* msg, str *uri, - union sockaddr_union *to_su, int proto) -{ - struct dest_info dst; - - if (uri2dst(&dst, msg, uri, proto)==0){ - LOG(L_ERR, "ERROR: uri2sock: Can't create a dst proxy\n"); - ser_error=E_BAD_ADDRESS; - return 0; - } - *to_su=dst.to; /* copy su */ - - /* we use dst->send_socket since uri2dst just set it correctly*/ - if (dst.send_sock==0) { - LOG(L_ERR, "ERROR: uri2sock: no corresponding socket for af %d\n", - to_su->s.sa_family); - ser_error = E_NO_SOCKET; - } - return dst.send_sock; -} -#endif - #endif /* _TM_UT_H */

1 0

git:master: core: move redundant and identical implementation of a str_list type to core
by Henning Westerholt 06 Jul '11

06 Jul '11

Module: sip-router Branch: master Commit: b1c80706eb428423d9c39796be5d4218d78ce06f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1c8070… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 5 23:38:13 2011 +0200 core: move redundant and identical implementation of a str_list type to core - move redundant str_list and new_str implementations from tm and tmx to core - rename new_str to a more descriptive append_str_list, no interface changes - fix callers in tm and tmx - add doxygen documentation --- modules/tm/rpc_uac.c | 37 +++++-------------------------- modules_k/tmx/t_mi.c | 47 ++++++--------------------------------- str_list.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ str_list.h | 54 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+), 71 deletions(-) diff --git a/modules/tm/rpc_uac.c b/modules/tm/rpc_uac.c index 34f7c36..f1458a1 100644 --- a/modules/tm/rpc_uac.c +++ b/modules/tm/rpc_uac.c @@ -29,6 +29,7 @@ #include "../../socket_info.h" #include "../../ut.h" #include "../../parser/parse_from.h" +#include "../../str_list.h" #include "ut.h" #include "dlg.h" #include "uac.h" @@ -50,13 +51,6 @@ -struct str_list { - str s; - struct str_list *next; -}; - - - /** make sure the rpc user created the msg properly. * Make sure that the FIFO user created the message * correctly and fill some extra parameters in function @@ -151,25 +145,6 @@ err: -static inline struct str_list *new_str(char *s, int len, - struct str_list **last, int *total) -{ - struct str_list *new; - new = pkg_malloc(sizeof(struct str_list)); - if (!new) { - LOG(L_ERR, "new_str: Not enough mem\n"); - return 0; - } - new->s.s = s; - new->s.len = len; - new->next = 0; - - (*last)->next = new; - *last = new; - *total += len; - return new; -} - /** construct a "header block" from a header list. @@ -208,7 +183,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, while(p) { d = q_memchr(needle, SUBST_CHAR, p); if (!d || d + 1 >= needle + p) { /* nothing to substitute */ - if (!new_str(begin, p, &last, &total_len)) goto error; + if (!append_str_list(begin, p, &last, &total_len)) goto error; break; } else { frag_len = d - begin; @@ -216,7 +191,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, switch(*d) { case SUBST_CHAR: /* double SUBST_CHAR: IP */ /* string before substitute */ - if (!new_str(begin, frag_len, &last, &total_len)) + if (!append_str_list(begin, frag_len, &last, &total_len)) goto error; /* substitute */ if (!sock_name) { @@ -234,12 +209,12 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, sock_name = &di.send_sock->address_str; portname = &di.send_sock->port_no_str; } - if (!new_str(sock_name->s, sock_name->len, &last, + if (!append_str_list(sock_name->s, sock_name->len, &last, &total_len)) goto error; /* inefficient - FIXME --andrei*/ - if (!new_str(":", 1, &last, &total_len)) goto error; - if (!new_str(portname->s, portname->len, &last, + if (!append_str_list(":", 1, &last, &total_len)) goto error; + if (!append_str_list(portname->s, portname->len, &last, &total_len)) goto error; /* keep going ... */ begin = needle = d + 1; diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 973061e..e784bf6 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -38,13 +38,9 @@ #include "../../parser/parse_from.h" #include "../../modules/tm/ut.h" #include "../../lib/kmi/mi.h" +#include "../../str_list.h" #include "tmx_mod.h" -/*! simple string list */ -struct str_list { - str s; - struct str_list *next; -}; /*! Which header fields should be skipped */ #define skip_hf(_hf) \ @@ -160,35 +156,6 @@ static inline struct mi_root* mi_check_msg(struct sip_msg* msg, str* method, return 0; } -/*! - * \brief Allocate a new str on a str list - * - * Allocate a new str in pkg_mem and attach it to a str list. Update - * the total number of list elements. - * \param s char array - * \param len length of the char array - * \param last last list element - * \param total total number of list elements - * \return pointer to the new list element - */ -static inline struct str_list *new_str(char *s, int len, struct str_list **last, int *total) -{ - struct str_list *new; - new=pkg_malloc(sizeof(struct str_list)); - if (!new) { - LM_ERR("no more pkg mem\n"); - return 0; - } - new->s.s=s; - new->s.len=len; - new->next=0; - - (*last)->next=new; - *last=new; - *total+=len; - - return new; -} /*! * \brief Convert a header field block to char array @@ -225,7 +192,7 @@ static inline char *get_hfblock( str *uri, struct hdr_field *hf, int *l, struct while(hf_avail) { d=memchr(needle, SUBST_CHAR, hf_avail); if (!d || d+1>=needle+hf_avail) { /* nothing to substitute */ - new=new_str(begin, hf_avail, &last, &total_len); + new=append_str_list(begin, hf_avail, &last, &total_len); if (!new) goto error; break; } else { @@ -234,7 +201,7 @@ static inline char *get_hfblock( str *uri, struct hdr_field *hf, int *l, struct switch(*d) { case SUBST_CHAR: /* double SUBST_CHAR: IP */ /* string before substitute */ - new=new_str(begin, frag_len, &last, &total_len); + new=append_str_list(begin, frag_len, &last, &total_len); if (!new) goto error; /* substitute */ if (!sock_name) { @@ -248,13 +215,13 @@ static inline char *get_hfblock( str *uri, struct hdr_field *hf, int *l, struct sock_name=&(*send_sock)->address_str; portname=&(*send_sock)->port_no_str; } - new=new_str(sock_name->s, sock_name->len, + new=append_str_list(sock_name->s, sock_name->len, &last, &total_len ); if (!new) goto error; /* inefficient - FIXME --andrei*/ - new=new_str(":", 1, &last, &total_len); + new=append_str_list(":", 1, &last, &total_len); if (!new) goto error; - new=new_str(portname->s, portname->len, + new=append_str_list(portname->s, portname->len, &last, &total_len ); if (!new) goto error; /* keep going ... */ @@ -268,7 +235,7 @@ static inline char *get_hfblock( str *uri, struct hdr_field *hf, int *l, struct } /* possible substitute */ } /* substitution loop */ /* proceed to next header */ - /* new=new_str(CRLF, CRLF_LEN, &last, &total_len ); + /* new=append_str_list(CRLF, CRLF_LEN, &last, &total_len ); if (!new) goto error; */ LM_DBG("one more hf processed\n"); } /* header loop */ diff --git a/str_list.c b/str_list.c new file mode 100644 index 0000000..a51bffa --- /dev/null +++ b/str_list.c @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of sip-router, a free SIP server. + * + * sip-router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * sip-router is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * @file + * @brief Simple str type list and helper functions + */ + + +#include "str.h" +#include "mem/mem.h" +#include "str_list.h" + + +/** + * @brief Add a new allocated list element to an existing list + * + * Add a new allocated list element to an existing list, the allocation is done + * from the private memory pool + * @param s input character + * @param len length of input character + * @param last existing list + * @param total length of total characters in list + * @return extended list + */ +struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total) +{ + struct str_list *new; + new = pkg_malloc(sizeof(struct str_list)); + if (!new) { + PKG_MEM_ERROR; + return 0; + } + new->s.s = s; + new->s.len = len; + new->next = 0; + + (*last)->next = new; + *last = new; + *total += len; + return new; +} diff --git a/str_list.h b/str_list.h new file mode 100644 index 0000000..6373d68 --- /dev/null +++ b/str_list.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2001-2003 FhG Fokus + * Copyright (C) 2006 Voice Sistem SRL + * + * This file is part of sip-router, a free SIP server. + * + * sip-router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * sip-router is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * @file + * @brief Simple str type list and helper functions + */ + + +#ifndef str_list_h +#define str_list_h + + +/** + * @brief Simple str type list + */ +struct str_list { + str s; + struct str_list *next; +}; + + +/** + * @brief Add a new allocated list element to an existing list + * + * Add a new allocated list element to an existing list, the allocation is done + * from the private memory pool + * @param s input character + * @param len length of input character + * @param last existing list + * @param total length of total characters in list + * @return extended list + */ +struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total); + +#endif

1 0

git:master: tm, tmx: move small redundant skip_hf macro to ut.h
by Henning Westerholt 06 Jul '11

06 Jul '11

Module: sip-router Branch: master Commit: 71a7a864c6d18f4fc0bde76c2f80e15df48d1476 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71a7a86… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 5 23:44:11 2011 +0200 tm, tmx: move small redundant skip_hf macro to ut.h - move small redundant skip_hf macro in in tm and tmx to tm/ut.h file - this header is already included from the callers - rename macro to a bit more descriptive name, no other changes --- modules/tm/rpc_uac.c | 11 +---------- modules/tm/ut.h | 9 +++++++++ modules_k/tmx/t_mi.c | 9 +-------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/modules/tm/rpc_uac.c b/modules/tm/rpc_uac.c index f1458a1..a305b63 100644 --- a/modules/tm/rpc_uac.c +++ b/modules/tm/rpc_uac.c @@ -42,15 +42,6 @@ -#define skip_hf(_hf) ( \ - ((_hf)->type == HDR_FROM_T) || \ - ((_hf)->type == HDR_TO_T) || \ - ((_hf)->type == HDR_CALLID_T) || \ - ((_hf)->type == HDR_CSEQ_T) \ -) - - - /** make sure the rpc user created the msg properly. * Make sure that the FIFO user created the message * correctly and fill some extra parameters in function @@ -174,7 +165,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, } for (; hf; hf = hf->next) { - if (skip_hf(hf)) continue; + if (tm_skip_hf(hf)) continue; begin = needle = hf->name.s; p = hf->len; diff --git a/modules/tm/ut.h b/modules/tm/ut.h index fff774b..4ca2751 100644 --- a/modules/tm/ut.h +++ b/modules/tm/ut.h @@ -61,6 +61,15 @@ #include "../../cfg_core.h" /* cfg_get(core, core_cfg, use_dns_failover) */ #endif + +/*! Which header fields should be skipped */ +#define tm_skip_hf(_hf) \ + (((_hf)->type == HDR_FROM_T) || \ + ((_hf)->type == HDR_TO_T) || \ + ((_hf)->type == HDR_CALLID_T) || \ + ((_hf)->type == HDR_CSEQ_T)) + + /* a forced_proto takes precedence if != PROTO_NONE */ inline static enum sip_protos get_proto(enum sip_protos force_proto, enum sip_protos proto) diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index e784bf6..4e31220 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -42,13 +42,6 @@ #include "tmx_mod.h" -/*! Which header fields should be skipped */ -#define skip_hf(_hf) \ - (((_hf)->type == HDR_FROM_T) || \ - ((_hf)->type == HDR_TO_T) || \ - ((_hf)->type == HDR_CALLID_T) || \ - ((_hf)->type == HDR_CSEQ_T)) - /*! * \brief Convert a URI into socket address. @@ -183,7 +176,7 @@ static inline char *get_hfblock( str *uri, struct hdr_field *hf, int *l, struct portname=sock_name=0; for (; hf; hf=hf->next) { - if (skip_hf(hf)) continue; + if (tm_skip_hf(hf)) continue; begin=needle=hf->name.s; hf_avail=hf->len;

1 0

git:master: core: small spelling fix and cleanup in doxygen docs
by Henning Westerholt 06 Jul '11

06 Jul '11

Module: sip-router Branch: master Commit: 7a437761156b08ad19465e90941995a48eee9ced URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a43776… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jul 5 23:34:41 2011 +0200 core: small spelling fix and cleanup in doxygen docs --- str.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/str.h b/str.h index 452fd7d..1985730 100644 --- a/str.h +++ b/str.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of ser, a free SIP server. @@ -70,7 +68,7 @@ struct _str{ }; -/** Data structure used across SER soruces to store counted-length strings. +/** Data structure used across SER sources to store counted-length strings. * @see _str */ typedef struct _str str;

1 0

git:master: core: new preprocessor directives: trydef and redef
by Daniel-Constantin Mierla 05 Jul '11

05 Jul '11

Module: sip-router Branch: master Commit: 13de789c655b2b5da47a9982fe19fef386265dc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13de789… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jul 5 23:45:14 2011 +0200 core: new preprocessor directives: trydef and redef - #!trydef - don't define if it is already done - #!redef - redefine even already defined - both have the prototype like #!define --- cfg.lex | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ main.c | 1 + ppcfg.h | 1 + 3 files changed, 73 insertions(+), 17 deletions(-) diff --git a/cfg.lex b/cfg.lex index 97e2f52..68ce3ff 100644 --- a/cfg.lex +++ b/cfg.lex @@ -553,6 +553,9 @@ DEFINE "define"|"def" IFDEF ifdef IFNDEF ifndef ENDIF endif +TRYDEF "trydefine"|"trydef" +REDEF "redefine"|"redef" + /* else is already defined */ EAT_ABLE [\ \t\b\r] @@ -1217,7 +1220,11 @@ IMPORTFILE "import_file" <INITIAL>{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count(); sr_cfg_compat=SR_COMPAT_MAX;} -<INITIAL>{PREP_START}{DEFINE}{EAT_ABLE}+ { count(); +<INITIAL>{PREP_START}{DEFINE}{EAT_ABLE}+ { count(); pp_define_set_type(0); + state = DEFINE_S; BEGIN(DEFINE_ID); } +<INITIAL>{PREP_START}{TRYDEF}{EAT_ABLE}+ { count(); pp_define_set_type(1); + state = DEFINE_S; BEGIN(DEFINE_ID); } +<INITIAL>{PREP_START}{REDEF}{EAT_ABLE}+ { count(); pp_define_set_type(2); state = DEFINE_S; BEGIN(DEFINE_ID); } <DEFINE_ID>{ID} { count(); if (pp_define(yyleng, yytext)) return 1; @@ -1666,6 +1673,8 @@ static int sr_pop_yy_state() #define MAX_DEFINES 256 static str pp_defines[MAX_DEFINES][2]; static int pp_num_defines = 0; +static int pp_define_type = 0; +static int pp_define_index = -1; /* pp_ifdef_stack[i] is 1 if the ifdef test at depth i is either * ifdef(defined), ifndef(undefined), or the opposite of these @@ -1687,23 +1696,55 @@ static int pp_lookup(int len, const char * text) return -1; } +int pp_define_set_type(int type) +{ + pp_define_type = type; + return 0; +} + int pp_define(int len, const char * text) { + int ppos; + + LOG(L_DBG, "++++++ attempting to define: %.*s\n", len, text); + if (pp_num_defines == MAX_DEFINES) { LOG(L_CRIT, "ERROR: too many defines -- adjust MAX_DEFINES\n"); return -1; } - if (pp_lookup(len, text) >= 0) { - LOG(L_CRIT, "ERROR: already defined: %.*s\n", len, text); - return -1; + pp_define_index = -1; + ppos = pp_lookup(len, text); + if(ppos >= 0) { + if(pp_define_type==1) { + LOG(L_DBG, "ignoring - already defined: %.*s\n", len, text); + pp_define_index = -2; + return 0; + } else if(pp_define_type==2) { + LOG(L_DBG, "redefining: %.*s\n", len, text); + pp_define_index = ppos; + if(pp_defines[ppos][1].s != NULL) { + pkg_free(pp_defines[ppos][1].s); + pp_defines[ppos][1].len = 0; + pp_defines[ppos][1].s = NULL; + } + return 0; + } else { + LOG(L_CRIT, "ERROR: already defined: %.*s\n", len, text); + return -1; + } } pp_defines[pp_num_defines][0].len = len; pp_defines[pp_num_defines][0].s = (char*)pkg_malloc(len+1); + if(pp_defines[pp_num_defines][0].s==NULL) { + LOG(L_CRIT, "no more memory to define: %.*s\n", len, text); + return -1; + } memcpy(pp_defines[pp_num_defines][0].s, text, len); pp_defines[pp_num_defines][1].len = 0; pp_defines[pp_num_defines][1].s = NULL; + pp_define_index = pp_num_defines; pp_num_defines++; return 0; @@ -1711,38 +1752,51 @@ int pp_define(int len, const char * text) int pp_define_set(int len, char *text) { + int ppos; + + if(pp_define_index == -2) { + /* #!trydef that should be ignored */ + return 0; + } + + if(pp_define_index < 0) { + /* invalid position in define table */ + LOG(L_BUG, "BUG: the index in define table not set yet\n"); + return -1; + } if(len<=0) { LOG(L_DBG, "no define value - ignoring\n"); return 0; } if (pp_num_defines == MAX_DEFINES) { - LOG(L_BUG, "BUG: setting define value, but no define id yet\n"); + LOG(L_CRIT, "ERROR: too many defines -- adjust MAX_DEFINES\n"); return -1; } if (pp_num_defines == 0) { - LOG(L_CRIT, "ERROR: too many defines -- adjust MAX_DEFINES\n"); + LOG(L_BUG, "BUG: setting define value, but no define id yet\n"); return -1; } - if (pp_defines[pp_num_defines-1][0].s == NULL) { + ppos = pp_define_index; + if (pp_defines[ppos][0].s == NULL) { LOG(L_BUG, "BUG: last define ID is null\n"); return -1; } - if (pp_defines[pp_num_defines-1][1].s != NULL) { - LOG(L_BUG, "BUG: ID %.*s redefined\n", - pp_defines[pp_num_defines-1][0].len, - pp_defines[pp_num_defines-1][0].s); + if (pp_defines[ppos][1].s != NULL) { + LOG(L_BUG, "BUG: ID %.*s [%d] overwritten\n", + pp_defines[ppos][0].len, + pp_defines[ppos][0].s, ppos); return -1; } - pp_defines[pp_num_defines-1][1].len = len; - pp_defines[pp_num_defines-1][1].s = text; + pp_defines[ppos][1].len = len; + pp_defines[ppos][1].s = text; LM_DBG("### setting define ID [%.*s] value [%.*s]\n", - pp_defines[pp_num_defines-1][0].len, - pp_defines[pp_num_defines-1][0].s, - pp_defines[pp_num_defines-1][1].len, - pp_defines[pp_num_defines-1][1].s); + pp_defines[ppos][0].len, + pp_defines[ppos][0].s, + pp_defines[ppos][1].len, + pp_defines[ppos][1].s); return 0; } diff --git a/main.c b/main.c index 2fcb40b..0ca144f 100644 --- a/main.c +++ b/main.c @@ -1912,6 +1912,7 @@ int main(int argc, char** argv) if(p) { *p = '\0'; } + pp_define_set_type(0); if(pp_define(strlen(optarg), optarg)<0) { fprintf(stderr, "error at define param: -A %s\n", optarg); diff --git a/ppcfg.h b/ppcfg.h index 8d7ea64..754d83b 100644 --- a/ppcfg.h +++ b/ppcfg.h @@ -28,6 +28,7 @@ int pp_subst_run(char **data); int pp_define(int len, const char *text); int pp_define_set(int len, char *text); +int pp_define_set_type(int type); #endif /*_PPCFG_H_*/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2011