sr-dev July 2010

sr-dev@lists.kamailio.org

29 participants
223 discussions

git:andrei/tcp_tls_changes: tcp: verbose and safer close()
by Andrei Pelinescu-Onciul 16 Jul '10

16 Jul '10

Module: sip-router Branch: andrei/tcp_tls_changes Commit: ab88df95e9fb22ca539bf399d597a844a63da676 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab88df9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 16 15:14:11 2010 +0200 tcp: verbose and safer close() - added tcp_safe_close(): a wrapper over close(). - repeat every close() on EINTR (not only the one called from tcp_main). In general according to posix the state of the file descriptor after an interrupted close() is undefined. However in the ser case it's always safe to retry the close (there are no other threads that might open new fds while the close() is retried). - ignore "expected" close() errors. On *BSDs (for example) close()-ing a socket will return the last error (e.g it can return ECONNRESET, EPIPE a.s.o.). Note that this is not true on linux. - on close failure be more verbose if there is enough information for a useful error message (the corresp. tcp connection structure is known and can still be used). --- tcp_main.c | 94 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 70 insertions(+), 24 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index aa4fc52..a1761f6 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -214,7 +214,6 @@ #endif #define MAX_SEND_FD_QUEUE_SIZE tcp_main_max_fd_no #define SEND_FD_QUEUE_SIZE 128 /* initial size */ -#define MAX_SEND_FD_RETRIES 96 /* FIXME: not used for now */ #define SEND_FD_QUEUE_TIMEOUT MS_TO_TICKS(2000) /* 2 s */ #endif @@ -480,6 +479,42 @@ error: +/** close a socket, handling errno. + * On EINTR, repeat the close(). + * Filter expected errors (return success if close() failed because + * EPIPE, ECONNRST a.s.o). Note that this happens on *BSDs (on linux close() + * does not fail for socket level errors). + * @param s - open valid socket. + * @return - 0 on success, < 0 on error (whatever close() returns). On error + * errno is set. + */ +static int tcp_safe_close(int s) +{ + int ret; +retry: + if (unlikely((ret = close(s)) < 0 )) { + switch(errno) { + case EINTR: + goto retry; + case EPIPE: + case ENOTCONN: + case ECONNRESET: + case ECONNREFUSED: + case ENETUNREACH: + case EHOSTUNREACH: + /* on *BSD we really get these errors at close() time + => ignore them */ + ret = 0; + break; + default: + break; + } + } + return ret; +} + + + /* blocking connect on a non-blocking fd; it will timeout after * tcp_connect_timeout * if BLOCKING_USE_SELECT and HAVE_SELECT are defined it will internally @@ -1201,7 +1236,7 @@ find_socket: *res_local_addr=*from; return s; error: - if (s!=-1) close(s); + if (s!=-1) tcp_safe_close(s); return -1; } @@ -1240,9 +1275,8 @@ struct tcp_connection* tcpconn_connect( union sockaddr_union* server, } tcpconn_set_send_flags(con, *send_flags); return con; - /*FIXME: set sock idx! */ error: - if (s!=-1) close(s); /* close the opened socket */ + if (s!=-1) tcp_safe_close(s); /* close the opened socket */ return 0; } @@ -1702,7 +1736,7 @@ inline static void tcp_fd_cache_add(struct tcp_connection *c, int fd) h=c->id%TCP_FD_CACHE_SIZE; if (likely(fd_cache[h].fd>0)) - close(fd_cache[h].fd); + tcp_safe_close(fd_cache[h].fd); fd_cache[h].fd=fd; fd_cache[h].id=c->id; fd_cache[h].con=c; @@ -2072,14 +2106,14 @@ redo_tls_encode: again on exit */ if (unlikely(n < 0 || response[1] == CONN_EOF)) { /* on error or eof, close fd */ - close(fd); + tcp_safe_close(fd); } else if (response[1] == CONN_QUEUED_WRITE) { #ifdef TCP_FD_CACHE if (cfg_get(tcp, tcp_cfg, fd_cache)) { tcp_fd_cache_add(c, fd); } else #endif /* TCP_FD_CACHE */ - close(fd); + tcp_safe_close(fd); } else { BUG("unexpected tcpconn_do_send() return & response:" " %d, %ld\n", n, response[1]); @@ -2091,7 +2125,7 @@ redo_tls_encode: tcp_fd_cache_add(c, fd); }else #endif /* TCP_FD_CACHE */ - close(fd); + tcp_safe_close(fd); /* here we can have only commands that _do_ _not_ dec refcnt. (CONN_EOF, CON_ERROR, CON_QUEUED_WRITE are all treated above) */ goto release_c; @@ -2107,7 +2141,11 @@ conn_wait_success: tcp_fd_cache_add(c, fd); } else #endif /* TCP_FD_CACHE */ - close(fd); + if (unlikely (tcp_safe_close(fd) < 0)) + LOG(L_ERR, "closing temporary send fd for %p: %s: " + "close(%d) failed (flags 0x%x): %s (%d)\n", c, + su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), + fd, c->flags, strerror(errno), errno); tcpconn_chld_put(c); /* release c (dec refcnt & free on 0) */ return n; conn_wait_error: @@ -2122,7 +2160,13 @@ conn_wait_close: c->state=S_CONN_BAD; /* we are here only if we opened a new fd (and not reused a cached or a reader one) => if the connect was successful close the fd */ - if (fd>=0) close(fd); + if (fd>=0) { + if (unlikely(tcp_safe_close(fd) < 0 )) + LOG(L_ERR, "closing temporary send fd for %p: %s: " + "close(%d) failed (flags 0x%x): %s (%d)\n", c, + su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), + fd, c->flags, strerror(errno), errno); + } TCPCONN_LOCK; if (c->flags & F_CONN_HASHED){ /* if some other parallel tcp_send did send CONN_ERROR to @@ -2356,17 +2400,17 @@ error: if (unlikely(fd_cache_e)){ tcp_fd_cache_rm(fd_cache_e); fd_cache_e = 0; - close(fd); + tcp_safe_close(fd); }else #endif /* TCP_FD_CACHE */ - if (do_close_fd) close(fd); + if (do_close_fd) tcp_safe_close(fd); } else if (response[1] == CONN_QUEUED_WRITE) { #ifdef TCP_FD_CACHE if (unlikely((fd_cache_e==0) && use_fd_cache)){ tcp_fd_cache_add(c, fd); }else #endif /* TCP_FD_CACHE */ - if (do_close_fd) close(fd); + if (do_close_fd) tcp_safe_close(fd); } else { BUG("unexpected tcpconn_do_send() return & response: %d, %ld\n", n, response[1]); @@ -2379,7 +2423,13 @@ end: tcp_fd_cache_add(c, fd); }else #endif /* TCP_FD_CACHE */ - if (do_close_fd) close(fd); + if (do_close_fd) { + if (unlikely(tcp_safe_close(fd) < 0)) + LOG(L_ERR, "closing temporary send fd for %p: %s: " + "close(%d) failed (flags 0x%x): %s (%d)\n", c, + su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), + fd, c->flags, strerror(errno), errno); + } /* here we can have only commands that _do_ _not_ dec refcnt. (CONN_EOF, CON_ERROR, CON_QUEUED_WRITE are all treated above) */ release_c: @@ -2859,7 +2909,7 @@ int tcp_init(struct socket_info* sock_info) return 0; error: if (sock_info->socket!=-1){ - close(sock_info->socket); + tcp_safe_close(sock_info->socket); sock_info->socket=-1; } return -1; @@ -2882,15 +2932,11 @@ inline static void tcpconn_close_main_fd(struct tcp_connection* tcpconn) #ifdef TCP_FD_CACHE if (likely(cfg_get(tcp, tcp_cfg, fd_cache))) shutdown(fd, SHUT_RDWR); #endif /* TCP_FD_CACHE */ -close_again: - if (unlikely(close(fd)<0)){ - if (errno==EINTR) - goto close_again; + if (unlikely(tcp_safe_close(fd)<0)) LOG(L_ERR, "ERROR: tcpconn_close_main_fd(%p): %s " "close(%d) failed (flags 0x%x): %s (%d)\n", tcpconn, su2a(&tcpconn->rcv.src_su, sizeof(tcpconn->rcv.src_su)), fd, tcpconn->flags, strerror(errno), errno); - } tcpconn->s=-1; } @@ -3917,13 +3963,13 @@ static inline int handle_new_connect(struct socket_info* si) LOG(L_ERR, "ERROR: maximum number of connections exceeded: %d/%d\n", *tcp_connections_no, cfg_get(tcp, tcp_cfg, max_connections)); - close(new_sock); + tcp_safe_close(new_sock); TCP_STATS_LOCAL_REJECT(); return 1; /* success, because the accept was succesfull */ } if (unlikely(init_sock_opt_accept(new_sock)<0)){ LOG(L_ERR, "ERROR: handle_new_connect: init_sock_opt failed\n"); - close(new_sock); + tcp_safe_close(new_sock); return 1; /* success, because the accept was succesfull */ } (*tcp_connections_no)++; @@ -3981,7 +4027,7 @@ static inline int handle_new_connect(struct socket_info* si) }else{ /*tcpconn==0 */ LOG(L_ERR, "ERROR: handle_new_connect: tcpconn_new failed, " "closing socket\n"); - close(new_sock); + tcp_safe_close(new_sock); (*tcp_connections_no)--; } return 1; /* accept() was succesfull */ @@ -4363,7 +4409,7 @@ static inline void tcpconn_destroy_all() if (likely(cfg_get(tcp, tcp_cfg, fd_cache))) shutdown(fd, SHUT_RDWR); #endif /* TCP_FD_CACHE */ - close(fd); + tcp_safe_close(fd); } (*tcp_connections_no)--; c=next;

1 0

git:andrei/tcp_tls_changes: tls: change read_ahead, buffers and freelist defaults
by Andrei Pelinescu-Onciul 16 Jul '10

16 Jul '10

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 6ecd49834d6f683188484f96d46874b48274dd8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ecd498… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jul 16 15:52:13 2010 +0200 tls: change read_ahead, buffers and freelist defaults - disable ssl_read_ahead by default. It is not needed anymore since now we have our own memory-like BIO, which buffers the socket I/O. While in the normal direct socket access case it's an important speed-up, in our case it would consume more memory and introduce a minor slow-down (extra memcpy). - if the openssl version supports it (>= 1.0.0) default to ssl_release_buffers = 1 (which instructs openssl to free the buffers as soon as possible) and ssl_freelist_max = 0 (don't keep free buffers around). This should decrease openssl memory consumption with no other impact (since we buffer everything in our custom BIO anyway). --- modules/tls/tls_cfg.c | 21 ++++++++++++++++----- modules/tls/tls_domain.c | 2 +- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index 8f1cff9..88b9b0f 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -53,10 +53,19 @@ struct cfg_group_tls default_tls_cfg = { 3, /* log */ 600, /* con_lifetime (s)*/ 1, /* disable_compression */ - -1, /* ssl_release_buffers (use the default: off) */ - -1, /* ssl_freelist_max (use the default: 32) */ - -1, /* ssl_max_send_fragment (use the default: 16k)*/ - 1, /* ssl_read_ahead (set, use -1 for the openssl default value)*/ +#if OPENSSL_VERSION_NUMBER >= 0x01000000L + 1, /* ssl_release_buffers (on, avoid extra buffering) */ +#else + -1, /* ssl_release_buffers: old openssl, leave it untouched */ +#endif /* openssl >= 1.0.0 */ +#if OPENSSL_VERSION_NUMBER >= 0x01000000L && ! defined OPENSSL_NO_BUF_FREELISTS + 0, /* ssl_freelist_max (immediately free) */ +#else + -1, /* ssl_freelist_max: old openssl, leave it untouched */ +#endif /* openssl >= 1.0.0 */ + -1, /* ssl_max_send_fragment (use the default: 16k), requires openssl + > 0.9.9 */ + 0, /* ssl_read_ahead (off, not needed, we have our own buffering BIO)*/ -1, /* low_mem_threshold1 */ -1, /* low_mem_threshold2 */ 10*1024*1024, /* ct_wq_max: 10 Mb by default */ @@ -172,7 +181,9 @@ cfg_def_t tls_cfg_def[] = { " Works only for OpenSSL >= 0.9.9"}, {"ssl_read_ahead", CFG_VAR_INT | CFG_READONLY, -1, 1, 0, 0, "Enables read ahead, reducing the number of BIO read calls done" - " internally by the OpenSSL library" }, + " internally by the OpenSSL library. Note that in newer tls" + " module versions it is better to have read ahead disabled, since" + " everything it is buffered in memory anyway"}, {"low_mem_threshold1", CFG_VAR_INT | CFG_ATOMIC, -1, 1<<30, 0, 0, "sets the minimum amount of free memory for accepting new TLS" " connections (KB)"}, diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index 97dc942..34fc23a 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -828,7 +828,7 @@ int tls_fix_domains_cfg(tls_domains_cfg_t* cfg, tls_domain_t* srv_defaults, #endif #endif #if defined (OPENSSL_NO_BUF_FREELISTS) || OPENSSL_VERSION_NUMBER < 0x01000000L - if (ssl_freelist_max_len != 0) + if (ssl_freelist_max_len >= 0) ERR("cannot change openssl freelist_max_len, openssl too old" "(needed at least 1.0.0) or compiled without freelist support" " (OPENSSL_NO_BUF_FREELIST)\n");

1 0

git:master: core: added pv name free function
by Daniel-Constantin Mierla 15 Jul '10

15 Jul '10

Module: sip-router Branch: master Commit: 2b2f4954554edaa7797a3e29da056b80393ec5dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b2f495… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 15 14:02:46 2010 +0200 core: added pv name free function - some PVs have dynamic name, therefore parsing them at runtime result in memory leak - the new attribute allow to free such kind of names - not the case so far with stable versions but this can happen when using such PVs with app_lua --- pvapi.c | 17 ++++++++++++++--- pvar.h | 3 +++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pvapi.c b/pvapi.c index bbd4b87..baeddab 100644 --- a/pvapi.c +++ b/pvapi.c @@ -1148,14 +1148,25 @@ error: } /** - * + * destroy the content of pv_spec_t structure */ -void pv_spec_free(pv_spec_t *spec) +void pv_spec_destroy(pv_spec_t *spec) { if(spec==0) return; - /* TODO: free name if it is PV */ + /* free name if it is PV */ + if(spec->pvp.pvn.nfree) + spec->pvp.pvn.nfree((void*)(&spec->pvp.pvn)); if(spec->trans) tr_free((trans_t*)spec->trans); +} + +/** + * free the pv_spec_t structure + */ +void pv_spec_free(pv_spec_t *spec) +{ + if(spec==0) return; + pv_spec_destroy(spec); pkg_free(spec); } diff --git a/pvar.h b/pvar.h index 58fe38b..e7701f2 100644 --- a/pvar.h +++ b/pvar.h @@ -84,6 +84,7 @@ enum _pv_type { typedef enum _pv_type pv_type_t; typedef int pv_flags_t; +typedef void (*pv_name_free_f)(void*); typedef struct _pv_value { @@ -95,6 +96,7 @@ typedef struct _pv_value typedef struct _pv_name { int type; /*!< type of name */ + pv_name_free_f nfree; /*!< function to free name structure */ union { struct { int type; /*!< type of int_str name - compatibility with AVPs */ @@ -174,6 +176,7 @@ int pv_set_spec_value(struct sip_msg* msg, pv_spec_p sp, int op, int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len); int pv_elem_free_all(pv_elem_p log); void pv_value_destroy(pv_value_t *val); +void pv_spec_destroy(pv_spec_t *spec); void pv_spec_free(pv_spec_t *spec); int pv_spec_dbg(pv_spec_p sp); int pv_get_spec_index(struct sip_msg* msg, pv_param_p ip, int *idx, int *flags);

1 0

git:master: core: print line for include_file errors
by Daniel-Constantin Mierla 15 Jul '10

15 Jul '10

Module: sip-router Branch: master Commit: 2b680bde0605cbc1cb4840105fafc83a2a235ec5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b680bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 15 13:48:21 2010 +0200 core: print line for include_file errors - easier to localize the error, reported by Raul Alexis Betancor Santana --- cfg.lex | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index e4b5486..564cb56 100644 --- a/cfg.lex +++ b/cfg.lex @@ -1249,7 +1249,10 @@ SUBST subst <INCLF>[ \t]* /* eat the whitespace */ <INCLF>[^ \t\n]+ { /* get the include file name */ if(sr_push_yy_state(yytext)<0) + { + LOG(L_CRIT, "error at %s line %d\n", (finame)?finame:"cfg", line); exit(-1); + } BEGIN(INITIAL); }

1 0

missing svn commit messages
by Henning Westerholt 14 Jul '10

14 Jul '10

Hi, somehow the SVN commit messages are not yet working for Timo. This are the missing commits: http://openser.svn.sourceforge.net/openser/?rev=6017&view=rev http://openser.svn.sourceforge.net/openser/?rev=6018&view=rev http://openser.svn.sourceforge.net/openser/?rev=6019&view=rev http://openser.svn.sourceforge.net/openser/?rev=6020&view=rev Daniel, do i need to setup some special mapping (maybe on www.kamailio.org) to make this work? Thanks and regards, Henning

2 3

cfg.help fails
by Juha Heinanen 14 Jul '10

14 Jul '10

ctl command cfg.help fails like this: # sip-proxy_ctl cfg.help error: 400 - error at parameter 0: expected string type but end of packet encountered -- juha

2 1

git:master: makefile: fix repo_state
by Andrei Pelinescu-Onciul 13 Jul '10

13 Jul '10

Module: sip-router Branch: master Commit: 420eb49f121793fe9094826e18bbf04ed1e65fce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=420eb49… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 13 21:00:37 2010 +0200 makefile: fix repo_state --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 516b294..7de18f7 100644 --- a/Makefile +++ b/Makefile @@ -564,8 +564,8 @@ repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ grep -v Makefile`" &&\ RV="$$RV"-dirty; echo "$$RV") repo_hash=$(subst -dirty,,$(repo_ver)) -repo_state=$(patsubst %-dirty,dirty,$(repo_ver)) -autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) cfg.y cfg.lex +repo_state=$(subst %-dirty,dirty,$(findstring -dirty,$(repo_ver))) +autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) cfg.y cfg.lex Makefile else # else if .git/ does not exist repo_ver=

1 0

git:master: kex: print the git hash instead of the svn hash
by Andrei Pelinescu-Onciul 13 Jul '10

13 Jul '10

Module: sip-router Branch: master Commit: 9683a7937dceb0a5e112c1b635c54fed87b7baa4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9683a79… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 13 20:40:14 2010 +0200 kex: print the git hash instead of the svn hash --- modules_k/kex/mi_core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/kex/mi_core.c b/modules_k/kex/mi_core.c index 241b0b6..36f5b93 100644 --- a/modules_k/kex/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -144,8 +144,8 @@ static struct mi_root *mi_version(struct mi_root *cmd, void *param) if (node==0) goto error; - node = add_mi_node_child( rpl, 0, MI_SSTR("SVN"), SVNREVISION, - sizeof(SVNREVISION)-1); + node = add_mi_node_child( rpl, 0, MI_SSTR("GIT"), (char*)repo_hash, + strlen(repo_hash)); if (node==0) goto error;

1 0

git:master: core: more version related rpcs
by Andrei Pelinescu-Onciul 13 Jul '10

13 Jul '10

Module: sip-router Branch: master Commit: 20fd4b8b75002c70ecfa826509fb5e5f2046b034 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20fd4b8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 13 20:38:08 2010 +0200 core: more version related rpcs core.flags - prints the compile flags. core.info - verbose version info, including the version, git hash, compiler, compile date and compile flags. --- core_cmd.c | 39 ++++++++++++++++++++++++++++++++++++++- ver.c | 4 ++++ ver.h | 4 ++++ 3 files changed, 46 insertions(+), 1 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index 589908d..2305370 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -339,6 +339,38 @@ static void core_version(rpc_t* rpc, void* c) +static const char* core_flags_doc[] = { + "Returns the compile flags.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +static void core_flags(rpc_t* rpc, void* c) +{ + rpc->add(c, "s", ver_flags); +} + + + +static const char* core_info_doc[] = { + "Verbose info, including version number, compile flags, compiler," + "repository hash a.s.o.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +static void core_info(rpc_t* rpc, void* c) +{ + void* s; + + if (rpc->add(c, "{", &s) < 0) return; + rpc->struct_printf(s, "version", "%s %s", ver_name, ver_version); + rpc->struct_add(s, "s", "id", ver_id); + rpc->struct_add(s, "s", "compiler", ver_compiler); + rpc->struct_add(s, "s", "compiled", ver_compiled_time); + rpc->struct_add(s, "s", "flags", ver_flags); +} + + + static const char* core_uptime_doc[] = { "Returns uptime of SER server.", /* Documentation string */ 0 /* Method signature(s) */ @@ -824,7 +856,12 @@ static rpc_export_t core_rpc_methods[] = { RET_ARRAY}, {"core.echo", core_echo, core_echo_doc, RET_ARRAY}, - {"core.version", core_version, core_version_doc, 0 }, + {"core.version", core_version, core_version_doc, + 0 }, + {"core.flags", core_flags, core_flags_doc, + 0 }, + {"core.info", core_info, core_info_doc, + 0 }, {"core.uptime", core_uptime, core_uptime_doc, 0 }, {"core.ps", core_ps, core_ps_doc, RET_ARRAY}, {"core.pwd", core_pwd, core_pwd_doc, RET_ARRAY}, diff --git a/ver.c b/ver.c index 80f1b26..e81586f 100644 --- a/ver.c +++ b/ver.c @@ -30,6 +30,10 @@ const char full_version[] = SER_FULL_VERSION " " REPO_VER; +const char ver_name[] = NAME; +const char ver_version[] = VERSION; +const char ver_arch[] = ARCH; +const char ver_os[] = OS_QUOTED; const char ver_id[] = REPO_HASH " " REPO_STATE; const char ver_compiled_time[] = __TIME__ " " __DATE__ ; const char ver_compiler[] = COMPILER; diff --git a/ver.h b/ver.h index ba036f3..25f1309 100644 --- a/ver.h +++ b/ver.h @@ -29,6 +29,10 @@ #define __ver_h extern const char full_version[]; +extern const char ver_name[]; +extern const char ver_version[]; +extern const char ver_arch[]; +extern const char ver_os[]; extern const char ver_id[]; extern const char ver_compiled_time[]; extern const char ver_compiler[];

1 0

git:master: core: move version strings to a separate file
by Andrei Pelinescu-Onciul 13 Jul '10

13 Jul '10

Module: sip-router Branch: master Commit: 1ef55a0915c675ada0cecf7c7b6e0bb0d72f4da7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ef55a0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jul 13 19:59:26 2010 +0200 core: move version strings to a separate file - moved version strings to variables (instead of macros) and in a separate file (ver.c). This will require re-compiling only one small file and re-linking on version or repository changes (e.g. new commit or local uncommitted changes), instead of recompiling main.c and core_cmd.c. - more detailed info about the repository state is now available via repo_hash (hash of the top commit) and repo_state (dirty or ""). - the core.version rpc reports now directly the version number (complete with repository hash and state), without prefixing it with "Server:", e.g.: ser 3.0.99-dev1 (i386/linux) dd9681-dirty instead of Server: ser (3.0.99-dev1 (i386/freebsd)) d89437-dirty --- Makefile | 11 ++++++++--- core_cmd.c | 12 +++++------- main.c | 40 ++++++++++++++++------------------------ modules_k/kex/mi_core.c | 10 +++------- sr_module.h | 2 +- ver.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ ver.h | 43 +++++++++++++++++++++++++++++++++++++++++++ version.h => ver_defs.h | 9 +++------ 8 files changed, 125 insertions(+), 48 deletions(-) diff --git a/Makefile b/Makefile index b3fa651..516b294 100644 --- a/Makefile +++ b/Makefile @@ -491,12 +491,11 @@ modules_search_path=$(subst $(space),:,$(strip\ # $(addprefix $(modules_target),$(modules_dirs)))) # special depends for main.o -main.d main.o: autover.h main.o: DEFS+=-DMODS_DIR='"$(modules_search_path)"' -#special depends for core_cmd.o -core_cmd.d core_cmd.o: autover.h +#special depends for ver.c +ver.d ver.o: autover.h include Makefile.shared @@ -564,10 +563,14 @@ repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ ; git diff-index --name-only HEAD 2>/dev/null | \ grep -v Makefile`" &&\ RV="$$RV"-dirty; echo "$$RV") +repo_hash=$(subst -dirty,,$(repo_ver)) +repo_state=$(patsubst %-dirty,dirty,$(repo_ver)) autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) cfg.y cfg.lex else # else if .git/ does not exist repo_ver= +repo_hash="unknown" +repo_state= autover_h_dep= endif @@ -579,6 +582,8 @@ autover.h: $(autover_h_dep) @echo " */" >>$@ @echo "" >>$@ @echo "#define REPO_VER \"$(repo_ver)\"" >>$@ + @echo "#define REPO_HASH \"$(repo_hash)\"" >>$@ + @echo "#define REPO_STATE \"$(repo_state)\"" >>$@ .PHONY: all all: $(NAME) every-module diff --git a/core_cmd.c b/core_cmd.c index b049af9..589908d 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -20,18 +20,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*! - * \file - * \brief SIP-router core :: - * \ingroup core - * Module: \ref core +/** core rpcs. + * @file core_cmd.c + * @ingroup core */ #include <time.h> #include <sys/types.h> #include <signal.h> -#include "autover.h" +#include "ver.h" #include "mem/mem.h" #include "mem/shm_mem.h" #include "sr_module.h" @@ -336,7 +334,7 @@ static const char* core_version_doc[] = { static void core_version(rpc_t* rpc, void* c) { - rpc->add(c, "s", SERVER_HDR " " REPO_VER ); + rpc->add(c, "s", full_version); } diff --git a/main.c b/main.c index 7d28bcd..8f71731 100644 --- a/main.c +++ b/main.c @@ -73,23 +73,20 @@ * 2008-08-08 sctp support (andrei) * 2008-08-19 -l support for mmultihomed addresses/addresses lists * (e.g. -l (eth0, 1.2.3.4, foo.bar) ) (andrei) - * 2010-04-19 added daemon_status_fd pipe to communicate the parent process with - the main process in daemonize mode, so the parent process can return - the proper exit status code (ibc) + * 2010-04-19 added daemon_status_fd pipe to communicate the parent process + * with the main process in daemonize mode, so the parent process + * can return the proper exit status code (ibc) */ -/*! - * \file - * \brief SIP-router core :: - * \ingroup core - * Module: \ref core +/** main file (init, daemonize, startup) + * @file main.c + * @ingroup core + * Module: core */ -/*! \defgroup core SIP-router core - * - * This modules implements a SIP server with a module interface - * for extendability. +/*! @defgroup core SIP-router core * + * sip router core part. */ #include <stdio.h> @@ -190,8 +187,7 @@ #ifdef DEBUG_DMALLOC #include <dmalloc.h> #endif -#include "autover.h" -#include "version.h" +#include "ver.h" /* define SIG_DEBUG by default */ #ifdef NO_SIG_DEBUG @@ -200,10 +196,6 @@ #define SIG_DEBUG #endif -static char id[]="@(#) $Id$"; -static char* version=SER_FULL_VERSION " " REPO_VER; -static char* flags=SER_COMPILE_FLAGS; -char compiled[]= __TIME__ " " __DATE__ ; static char help_msg[]= "\ @@ -1688,7 +1680,7 @@ int main(int argc, char** argv) opterr = 0; while((c=getopt(argc,argv,options))!=-1) { if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { - printf("version: %s\n", version); + printf("version: %s\n", full_version); printf("%s",help_msg); exit(0); break; @@ -1724,8 +1716,8 @@ int main(int argc, char** argv) default_core_cfg.debug++; break; case 'V': - printf("version: %s\n", version); - printf("flags: %s\n", flags ); + printf("version: %s\n", full_version); + printf("flags: %s\n", ver_flags ); print_ct_constants(); #ifdef USE_SCTP tmp=malloc(256); @@ -1733,9 +1725,9 @@ int main(int argc, char** argv) printf("sctp unsupported socket options: %s\n", tmp); if (tmp) free(tmp); #endif - printf("%s\n",id); - printf("%s compiled on %s with %s\n", __FILE__, - compiled, COMPILER ); + printf("id: %s\n", ver_id); + printf("compiled on %s with %s\n", + ver_compiled_time, ver_compiler ); exit(0); break; diff --git a/modules_k/kex/mi_core.c b/modules_k/kex/mi_core.c index 157d9f4..241b0b6 100644 --- a/modules_k/kex/mi_core.c +++ b/modules_k/kex/mi_core.c @@ -47,7 +47,7 @@ #include "../../pt.h" #include "../../mem/mem.h" #include "../../lib/kmi/mi.h" -#include "../../version.h" +#include "../../ver.h" #include "../../cfg/cfg.h" #include "../../cfg/cfg_ctx.h" @@ -139,12 +139,8 @@ static struct mi_root *mi_version(struct mi_root *cmd, void *param) if (node==0) goto error; -#ifndef KAMAILIO_COMPILE_FLAGS -#define KAMAILIO_COMPILE_FLAGS SER_COMPILE_FLAGS -#endif - - node = add_mi_node_child( rpl, 0, MI_SSTR("Flags"), KAMAILIO_COMPILE_FLAGS, - sizeof(KAMAILIO_COMPILE_FLAGS)-1); + node = add_mi_node_child( rpl, 0, MI_SSTR("Flags"), (char*)ver_flags, + strlen(ver_flags)); if (node==0) goto error; diff --git a/sr_module.h b/sr_module.h index b055c88..d098f78 100644 --- a/sr_module.h +++ b/sr_module.h @@ -61,7 +61,7 @@ #include <dlfcn.h> #include "parser/msg_parser.h" /* for sip_msg */ -#include "version.h" +#include "ver_defs.h" #include "rpc.h" #include "route_struct.h" #include "route.h" diff --git a/ver.c b/ver.c new file mode 100644 index 0000000..80f1b26 --- /dev/null +++ b/ver.c @@ -0,0 +1,46 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** version strings. + * @file ver.c + * @ingroup: core + */ +/* + * History: + * -------- + * 2010-07-13 initial version (andrei) +*/ + +#include "ver_defs.h" +#include "autover.h" /* REPO_VER, REPO_STATE */ + + +const char full_version[] = SER_FULL_VERSION " " REPO_VER; +const char ver_id[] = REPO_HASH " " REPO_STATE; +const char ver_compiled_time[] = __TIME__ " " __DATE__ ; +const char ver_compiler[] = COMPILER; + +const char ver_flags[] = SER_COMPILE_FLAGS; + +/** hash-state. */ +const char repo_ver[] = REPO_VER; +/** git hash. */ +const char repo_hash[] = REPO_HASH; +/** state of the repository: dirty (uncommited changes) or "" */ +const char repo_state[] = REPO_STATE; + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/ver.h b/ver.h new file mode 100644 index 0000000..ba036f3 --- /dev/null +++ b/ver.h @@ -0,0 +1,43 @@ +/* + * $Id$ + * + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** version strings. + * @file ver.h + * @ingroup: core + */ +/* + * History: + * -------- + * 2010-07-13 initial version (andrei) +*/ + +#ifndef __ver_h +#define __ver_h + +extern const char full_version[]; +extern const char ver_id[]; +extern const char ver_compiled_time[]; +extern const char ver_compiler[]; +extern const char ver_flags[]; +extern const char repo_ver[]; +extern const char repo_hash[]; +extern const char repo_state[]; + + +#endif /*__ver_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/version.h b/ver_defs.h similarity index 98% rename from version.h rename to ver_defs.h index 1c60539..e6eb391 100644 --- a/version.h +++ b/ver_defs.h @@ -23,12 +23,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/*! - * \file - * \brief SIP-router core :: version and compile flag macros - * \ingroup core - * - * Module: \ref core +/** compile flags and other version related defines. + * @file ver_defs.h + * @ingroup core */ #ifndef version_h

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2010