sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

by Elias Baixas

Hello all, I have been working on the seas module to make it work on sip-router. I have my own git branch locally, but I'd like to share it on the sip-router public git so that others can take a look and finally push it to the master branch. it needs some transaction-module changes, so it needs good review from other more tm-knowledgable coders before it can be finally merged. where do I need to send my public ssh key to get commit access to the sip-router git ? thanks Elias

14 years, 5 months

Git Crash Course For sip-router

by Jan Janak

Hello, Here is a brief git crash course for those who are used to CVS or SVN. The purpose of this crash course is to get you started, it describes basic operations that you will need to do simple changes in the sip-router git repository. You can find links to more documentation at the end. First of all, you'll need to install git. The name of the corresponding Debian package is git-core. Debian Lenny contains version 1.5.6.5 which is sufficient. Newer git versions or packages for other distributions or architectures can be obtained from http://git-scm.com/. As the second step you need to configure the git client. I have attached configuration files to this email for your convenience, save files .gitconfig and .gitignore in your home directory. File sip-router.org_CA.pem is optional, you will only need the file if you plan on accessing the repository over https (that's not the case for developers with write access). Edit file ~/.gitconfig and configure your name and email address there. This is the name and email address that will be visible in git commits. Unlike CVS or SVN commits, git commits contain full name and email address of the commiter, this is the name and email that will be visible in git history. Note that the email address to be used in From header of commit logs sent to the development mailing list is configured separately on the server (there are technical reasons for this). Here is how I configured my name in email address in ~/.gitconfig: [user] name = Jan Janak email = jan(a)iptel.org The git configuration file in your home directory sets up a bunch of short aliases for most common git commands, so you do not have to type $ git checkout every time you are checking out a branch, you can just type 'git co' instead, and if you alias git to 'g' in your ~/.bashrc then it becomes just 'g co' which is much more convenient. Another setting that is particular to our repository is the number of characters used for tabs in the git pager. Git uses less as the default pager and less is configured to use 8 spaces for tabs by default. We use 4 spaces in our sources and thus you might want to re-configure the git pager in your ~/.bashrc. The following setting makes the output of 'git diff' and friends look prettier: export GIT_PAGER="less --tabs=4" Now you can start working with git. The first command that you need to run is 'git clone', this is the command that is used to retrieve the sip-router repository from the server: $ git clone ssh://<username>@git.sip-router.org/sip-router Replace <username> with your real username. The contents of the repository will be stored in 'sip-router' subdirectory of your current working directory. This command is the git equivalent of cvs/svn checkout. Like cvs/svn it will make the most recent version of the sources available in the subdirectory. UNLIKE cvs/svn, this command does not retrieve just the latest version of the sources, it copies the whole history of the project to your local hard drive, not just the latest revision, but all revisions that are stored in the repository, since tday 1. You do not have to be worried about the size of the repository, the full history of SER takes about 40MB only. Also, you will need to run the command only once (or occassionally if you wipe your local copy out entirely). There are other git commands (covered later) that can be used to keep your local copy up-to-date. Those commands can figure out the difference between your local version of the repository and the version on the server and they will transfer only the data that has changed. In other words, 'git clone' is similar to the scp command, it creates a local identical copy of the remote repository by copying the whole remote repository to the local machine. Once you have a local copy of the sip-router repository, you can try to see what is in there: $ cd sip-router $ git branch The command above shows a list of branches that are present in your local copy of the repository. Most likely you will see just one branch called 'master' marked with an asterisk. This means that your local repository contains only one branch called 'master' and the asterisk tells you that this is the branch that is currently checked out. So the sources that you see in that directory come from the master branch. The local master branch is an exact copy of the 'master' branch from the remote repository at git.sip-router.org and it contains latest sip-router sources. Typically, the branch with the most up-to-date code is called 'master' in git. It is the git equivalent of CVS HEAD branch and SVN trunk branch. NOTE: Branches are sometimes called 'heads' in git documentation, but you can just remember that 'branch' and 'head' refers to the same thing. If you look at the remote version of the repository with gitweb at http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=heads you will notice that there are more branches than the 'master' branch which was created by 'git clone' in the local copy of the repository. The command 'git clone' only makes the master branch directly available in the local copy of the repository. For other branches it merely records the fact that the branches exist in the remote repository. To display branches from both the local and the remote repository you can run: $ git branch -a The output should look roughly like this: * master origin/HEAD origin/MAIN origin/Maintainer origin/andrei/cvshead origin/andrei/sctp origin/andrei/sctp_fixes origin/andrei/sctp_one_to_one origin/andrei_sctp origin/cancel_fix origin/cvs-head origin/janakj/cvshead origin/janakj/doxygen origin/master Branches that start with "origin/" are branches that exist in the remote repository. The string origin is just a short alias for the full URI of the remote repository, such as ssh://git.sip-router.org/sip-router. It is a convention that the repository you cloned from initially is called the origin. Once you have the local repository, you can start making changes in it. Modifying the code on the master branch directly is really easy, because git clone already created the master branch for you in local repository and it checked out the master branch by default. Here is how can you make a simple change in one file and commit the result: $ edit main.c $ git add main.c $ git commit As you can see above you need to call 'git add' before you call 'git commit'. 'git add' marks your changes to be commited during the next commit, this is useful, for example, if you want to leave some local changes uncommited while you make the commit. Unlike CVS or SVN, git does not assume that all local changes should be commited during the next commit. It lets you explicitly select a set of changes to be commited. You can avoid the need to call two commands with 'git commit -a', see the git documentation for more details. When you are done with the commit, you can display the list of changes in the repository with 'git log'. The command displays the history of changes in the whole repository, if you want to limit the list to main.c only then you can run 'git log main.c'. If you look closely at the output of 'git log' then you will notice strange lines starting with "commit" followed by a long string of characters: commit 0253726f99ac151f748712a5d39d71f42d9defc6 The long string is how commits in git are represented. This string is a SHA1 checksum of the commit and it is the git equivalent SVN revision numbers. Like SVN revision numbers and UNLIKE CVS versions, this identifier represents the state of the whole repository, not just individual files. Because such long identifier are tedious to type, git supports abbreviated format, you can type just the beginning of the string as long as the beginning of the string is unique. In other words, there must be at most one commit in the database of all commits with this prefix. For example the following two commands refer to the same commit: $ git diff b0f6ec8784712e4c1436fc9a4a3b54296e94ba5c $ git diff b0f6e If somebody creates another commit with an SHA1 id starting with b0f6e later then 'git diff b0f6e' would not longer work and git would complain that the prefix is ambiguous. All changes, such as the commit above, that you do affect the local repository only. There is absolutely no communication with the the remote repository in any of the commands above (git add, git commit, git log). This is possible because we created a full copy of the remote repository with 'git clone'. This is also the reason why all the commands are so fast, unlike their equivalents in CVS or SVN. The fact that you perform all actions/modifications on the local repository only and then you instruct git to do its black magic and synchronize your local changes with the remote repository is probably the biggest difference from CVS/SVN and one of the things that is hard to understand for people who are used to CVS/SVN. This is also why git falls into the category of distributed revision control systems. When you are satisfied with your local changes/commits, you can decide to make them available to others. This can be done by uploading your local changes to the remote repository (the one you initially cloned from). In git terminology this operation is called 'push', so you can push your local changes to the remote repository with 'git push': $ git push origin master:master The first parameter is the name of the remote repository, the second parameter is the name of the local branch and the name of the remote branch, delimited by ':'. You can omit the 2nd parameter: $ git push origin and then 'git push' will upload all local branches to the remote repository. You can also omit the first parameter: $ git push and in that case repository 'origin' is used. The opposite of 'git push' is 'git pull'. This is the operation that you can use to synchronize your local repository with the remote repository. 'git pull' downloads all changes (made by others) from the remote repository that are not yet in your local repository and integrates them into your local repository. You can run 'git pull' whenever you are online to fetch latest changes and keep your local copy of the repository up-to-date. 'git push' and 'git pull' are similar to rsync, they update either the local or the remote copy of the repository by tranferring only what is missing. 'git push' is the git equivalent of 'cvs ci' and 'svn ci'. 'git pull' is the git equivalent of 'cvs update' or 'svn update'. If you make only small changes to the repository then you can modify the master branch directly, as described above. This approach is suitable only for small, trivial changes. If are working on a change which takes longer to implement, consists of many commits, then it is better to create a separate branch and do the development on a separate branch. Branches in git are cheap, remember that all operations, including branch creation, are local operations. You do not even have to push your local branches into the remote repository, you can just keep them in the local copy for your own purposes. You can create a new branch in your local repository with 'git checkout': $ git checkout --track -b mybranch master This command creates a new branch called 'mybranch', configures the branch to track the master branch and checks the new branch out. The word 'track' in this context means that the newly created branch will receive all updates from the master branch whenever you run 'git pull' with this branch checked out. In other words, the branch tracks another branch (master in this case) by merging all changes from the original branch. Command line option -b instructs git to to create a new branch. If this option was omitted then git would assume that 'mybranch' is an existing branch and it would try to check the branch out. The newly created branch exists in the local repository only. If you want to push the branch to the remote repository then you can use 'git push' again: $ git push origin mybranch:janakj/mybranch Because mybranch is a private topic branch of mine, I am pushing it as janakj/mybranch to the remote repository at git.sip-router.org. The remote repository only permits new "username" branches. In other words their name must start with your username. If you try: $ git push origin mybranch:mybranch then git will report an error. The main reason why we have this restriction in place is because we wanted to make sure that people do not push all local branches to the remote repository by accident. This can easily happen if you run 'git push' without any parameters. You can also delete a local branch that is no longer needed by running $ git branch -D mybranch This will delete the local branch only. If you pushed the branch to the remote repository then you might also want to delete the branch in the remote repository with 'git push': $ git push :janakj/mybranch This is a special syntax of 'git push', if you omit the name of the local branch then 'git push' deletes the remote branch whose name follows ':'. Test Repository =============== We have a test repository at git.sip-router.org which you can use to test various git operations. Clone the repository with: $ git clone ssh://username@git.sip-router.org/test and there you can test whatever you want. The repository can also be browsed with gitweb at http://git.sip-router.org/cgi-bin/gitweb.cgi?p=test;a=summary Further Reading =============== [1] Git related pages in the wiki: http://sip-router.org/wiki/git [2] http://eagain.net/articles/git-for-computer-scientists/ [3] Git SVN Crashcourse: http://git.or.cz/course/svn.html [4] http://git-scm.com/documentation

14 years, 6 months

git:master: makefile: quiet output support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e37e8d6a6158d49aa5fa1092d91b595cf0d91e2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e37e8d6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 15:30:02 2009 +0200 makefile: quiet output support Support for quiet output (without all the flags and compile options): make Q=1 or make QUIET=1. It can be saved in the config (e.g. make config Q=1) and it can be overridden any time (e.g. make utils Q=0). Compilation is a little faster in quiet mode and the same speed as before in normal mode. Example module output: CC (gcc) [M tm.so] uac.o LD (gcc) [M tm.so] tm.so Lib example: LD (gcc) [L libbinrpc.so.0.1] libbinrpc.so.0.1 --- Makefile.defs | 3 ++- Makefile.rules | 28 ++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index f883a0b..a9bd307 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1901,7 +1901,8 @@ saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME \ PREFIX LOCALBASE \ TAR \ INSTALL INSTALL_CFG INSTALL_BIN INSTALL_MODULES INSTALL_DOC \ - INSTALL_MAN INSTALL_LIB INSTALL_TOUCH INSTALL_SHARE + INSTALL_MAN INSTALL_LIB INSTALL_TOUCH INSTALL_SHARE \ + Q # variable changeable at compile time # extra: prefix DESTDIR BASEDIR basedirt diff --git a/Makefile.rules b/Makefile.rules index 99042c3..55c7897 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -52,9 +52,33 @@ endif ALLDEP+=makecfg.lst +# returns current type: "" core/unknown, "M" module, "L" libray, "U" util +crt_type=$(if $(MOD_NAME),M,$(if $(LIB_NAME),L,$(if $(UTIL_NAME),U))) + +cmd_CC=$(CC) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) -c $< -o $@ +cmd_LD=$(LD) $(LDFLAGS) $(objs) $(extra_objs) $(ALL_LIBS) $(SER_RPATH) \ + -o $(NAME) + +# what will be displayed if quiet==silent +silent_cmd_CC=CC ($(CC)) [$(strip $(crt_type) $(NAME))] $@ +silent_cmd_LD=LD ($(LD)) [$(strip $(crt_type) $(NAME))] $@ + +ifneq (,$(filter 1 yes on, $(Q) $(QUIET))) +quiet=silent +Q=1 +else +Q=0 +quiet=verbose +endif + +quote:= " +escall= $(subst $$,$$$$,$(subst $(quote),\$(quote),$1)) +exec_cmd= $(if $($(quiet)_cmd_$(1)),\ + @echo "$(call escall,$($(quiet)_cmd_$(1)))" ;) $(cmd_$(1)) + #implicit rules %.o:%.c $(ALLDEP) - $(CC) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) -c $< -o $@ + $(call exec_cmd,CC) %.d: %.c $(ALLDEP) @set -e; $(MKDEP) $(CFLAGS) $(C_INCLUDES) $(INCLUDES) $(C_DEFS) $(DEFS) $<\ @@ -149,7 +173,7 @@ endif # normal rules $(NAME): $(objs) $(ALLDEP) - $(LD) $(LDFLAGS) $(objs) $(extra_objs) $(ALL_LIBS) $(SER_RPATH) -o $(NAME) + $(call exec_cmd,LD) librpath.lst: $(ALLDEP)

14 years, 6 months

removal of dbg module

by Henning Westerholt

Hi, during a review i noticed that it seems that all the functionality in the modules_s/dbg module is also provided from the modules_k/cfgutils module. function mapping: - dbg_msleep(n) -> usleep(n*1000) - dbg_abort() -> abort() - dbg_pkg_status() -> pkg_status() - dbg_shm_status() -> shm_status() It is ok when i remove this module? If this one additional multiplication is not ok, i can of course also add a 'm_sleep' function to the cfgutils module as well. Regards, Henning

14 years, 6 months

new module: embedded lua

by Daniel-Constantin Mierla

Hello, few weeks ago I uploaded a new module named app_lua, providing functionality to execute Lua (http://www.lua.org) scripts in your configuration file. Lua is small and fast, therefore fits very well in a sip proxy environment. It has a lot of extensions, so when you cannot do something with existing cfg functions, check this one as well. The readme and the api are available at: http://sip-router.org/wiki/api/lua/devel http://sip-router.org/docbook/sip-router/branch/master/modules/app_lua/app_… The API will be enhanced during this development cycle, your feedback will help a lot in this direction. By now you get access to pseudo-variables, sip headers, logging functions and sl module. For new comers in community, if you are a Perl fan, then you can use the perl module in a similar way. Also, another module was uploaded recently, app_python, allowing to write python extensions. Module and API for Python are not yet documented, but I think this is not a barrier for a true Python fan, actually I hope will be a motivation to contribute the docs :-) Cheers, Daniel -- Daniel-Constantin Mierla SIP Server Professional Solutions * http://www.asipto.com/

14 years, 8 months

How to change the reply msg in the onreply_route

by Min Wang

Hi I have following scenario: u1---> p1 --> u2 u1 calling u2, u2 reply with 200 OK, The p1 need to check something, and decide to send ACK/Bye to u2, and 488 to u1: onreply_route[1] { if (my_function_check("")) { release_call_onreply(""); } } The question is : How to do implement release_call_onreply correctly? The pseudo codes is like: t=tmb.t_gett(); send_request(method_ACK); send_request(method_BYE); reason_code = 488 tmb.t_reply(t->uas.request,reason_code,reason_text); (Not sure if t_reply can be called here or not.) The ACK/Bye is sent to U2, 488 is sent to U1, But the issue is it seems the original 200 OK is forwarded to U1 as well. How to avoid it? Or should the Data lumps function be used here to modify the 200 reply msg instead of using t_reply here? Kind Regards Min Wang

14 years, 9 months

TCP and TLS connection handling

by Vadim Lebedev

Hello, I'm investigation possiblity to implement DTLS support and in this context I wonder if some kind soul can point me to an overview explaining how SR is handling TCP and TLS connections. I'd like to understand how are they assigned to child processes and and what happens when for example child A receives a request which should be forwarded to the connection handled by the child B? Thanks Vadim

14 years, 9 months

git:master: core: msg_parse minor 64bit warning fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c0e9cb82abe293937e5b95fa1347afdc118d9ac2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0e9cb8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 26 15:21:50 2010 +0100 core: msg_parse minor 64bit warning fix --- parser/msg_parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index ab90137..97378c7 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -348,7 +348,7 @@ int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next) switch (hf->type){ case HDR_ERROR_T: LOG(L_INFO,"ERROR: bad header field [%.*s]\n", - (end-tmp>20)?20:(end-tmp), tmp); + (end-tmp>20)?20:(int)(end-tmp), tmp); goto error; case HDR_EOH_T: msg->eoh=tmp; /* or rest?*/

14 years, 9 months

git:master: tm: experimental tm onreply_route final reply DROP support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e81c62ec2fd8666fc5b3a86c33e55e40029f2349 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e81c62e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 26 15:10:49 2010 +0100 tm: experimental tm onreply_route final reply DROP support Experimental support for dropping final replies from tm onreply_route[]s. It's disabled by default (causes a small performance hit and it's not needed in most cases). To enable re-compile tm with -DTM_ONREPLY_FINAL_DROP_OK (e.g. make cfg extra_defs=-DTM_ONREPLY_FINAL_DROP_OK; make all or make -C modules/tm extra_defs=-DTM_ONREPLY_FINAL_DROP_OK) --- modules/tm/t_reply.c | 65 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 9 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 9fbe6c3..f28cf05 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -94,9 +94,17 @@ * 2009-12-10 reply route is executed under lock to protect the avps (andrei) * 2010-02-22 _reply() will cleanup any reply lumps that it might have added * (andrei) + * 2010-02-26 added experimental support for final reply dropping, not + * enabled by default (performance hit) (andrei) * */ + /* Defines: + * TM_ONREPLY_FINAL_DROP_OK - allows dropping the final reply + * from the tm onreply_routes, but comes with a small performance + * hit (extra unlock()/lock() for each final reply when a onreply + * route is set). + */ #ifdef EXTRA_DEBUG #include <assert.h> @@ -147,6 +155,10 @@ #include "uac.h" +#ifdef NO_TM_ONREPLY_FINAL_DROP_OK +#undef TM_ONREPLY_FINAL_DROP_OK +#endif + /* private place where we create to-tags for replies */ /* janakj: made public, I need to access this value to store it in dialogs */ char tm_tags[TOTAG_VALUE_LEN]; @@ -1880,6 +1892,7 @@ int reply_received( struct sip_msg *p_msg ) int branch; /* has the transaction completed now and we need to clean-up? */ int reply_status; + int onreply_route; branch_bm_t cancel_bitmap; struct ua_client *uac; struct cell *t; @@ -1939,11 +1952,20 @@ int reply_received( struct sip_msg *p_msg ) DBG("DEBUG: reply to local CANCEL processed\n"); goto done; } - - + + onreply_route=t->on_reply; if ( msg_status >= 200 ){ - /* stop final response timer & retr. only if I got a final response */ - stop_rb_timers(&uac->request); +#ifdef TM_ONREPLY_FINAL_DROP_OK +#warning Experimental tm onreply_route final reply DROP support active + if (onreply_route) + /* stop only retr., but leave the final reply timers on, in case + the final reply is dropped in the on_reply route */ + stop_rb_retr(&uac->request); + else +#endif /* TM_ONREPLY_FINAL_DROP_OK */ + /* stop final response timer & retr. if I got a + final response */ + stop_rb_timers(&uac->request); /* acknowledge negative INVITE replies (do it before detailed * on_reply processing, which may take very long, like if it * is attempted to establish a TCP connection to a fail-over dst */ @@ -2030,7 +2052,7 @@ int reply_received( struct sip_msg *p_msg ) p_msg->fwd_send_flags.blst_imask|= uac->request.dst.send_flags.blst_imask & BLST_503; /* processing of on_reply block */ - if (t->on_reply) { + if (onreply_route) { set_route_type(TM_ONREPLY_ROUTE); /* transfer transaction flag to message context */ if (t->uas.request) p_msg->flags=t->uas.request->flags; @@ -2052,7 +2074,7 @@ int reply_received( struct sip_msg *p_msg ) /* lock onreply_route, for safe avp usage */ LOCK_REPLIES( t ); replies_locked=1; - run_top_route(onreply_rt.rlist[t->on_reply], p_msg, &ctx); + run_top_route(onreply_rt.rlist[onreply_route], p_msg, &ctx); /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; getbflagsval(0, &uac->branch_flags); @@ -2070,13 +2092,36 @@ int reply_received( struct sip_msg *p_msg ) /* handle a possible DROP in the script, but only if this is not a final reply (final replies already stop the timers and droping them might leave a transaction living forever) */ - if ((ctx.run_flags&DROP_R_F) && (msg_status<200)) { - if (unlikely(replies_locked)) { +#ifdef TM_ONREPLY_FINAL_DROP_OK + if (unlikely(ctx.run_flags&DROP_R_F)) +#else + if (unlikely((ctx.run_flags&DROP_R_F) && (msg_status<200))) +#endif /* TM_ONREPLY_FINAL_DROP_OK */ + { + if (likely(replies_locked)) { replies_locked = 0; UNLOCK_REPLIES( t ); } goto done; } +#ifdef TM_ONREPLY_FINAL_DROP_OK + if (msg_status >= 200) { + /* stop final reply timers, now that we executed the onreply route + and the reply was not DROPed */ + if (likely(replies_locked)){ + /* if final reply => we have to execute stop_rb_timers, but + with replies unlocked to avoid a possible deadlock + (if the timer is currently running, stop_rb_timers() + will wait until the timer handler ends, but the + final_response_handler() will try to lock replies => + deadlock). + */ + UNLOCK_REPLIES( t ); + replies_locked=0; + } + stop_rb_timers(&uac->request); + } +#endif /* TM_ONREPLY_FINAL_DROP_OK */ } #ifdef USE_DST_BLACKLIST /* add temporary to the blacklist the source of a 503 reply */ @@ -2129,8 +2174,10 @@ int reply_received( struct sip_msg *p_msg ) } } #endif - if (unlikely(!replies_locked)) + if (unlikely(!replies_locked)){ LOCK_REPLIES( t ); + replies_locked=1; + } if ( is_local(t) ) { reply_status=local_reply( t, p_msg, branch, msg_status, &cancel_bitmap ); if (reply_status == RPS_COMPLETED) {

14 years, 9 months

git:master: tls: TLS_MALLOC_DBG can now be set on make cfg

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9bc19d4994f20aa354092aba9ae784de91547fc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9bc19d4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 26 13:39:55 2010 +0100 tls: TLS_MALLOC_DBG can now be set on make cfg Enabling tls extra malloc debugging info, does not require anymore editing tls_init.c. It can be enabled at cfg time (make cfg extra_defs=-DTLS_MALLOC_DBG) or at compile/re-compile time ( make -C modules/tls clean; make -C modules/tls extra_defs=-DTLS_MALLOC_DBG). When TLS_MALLOC_DBG is enabled, an extra warning will be printed at compile time. NO_TLS_MALLOC_DBG takes precedence over TLS_MALLOC_DBG. --- modules/tls/tls_init.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index d7ade41..a685c83 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -128,12 +128,16 @@ int tls_force_run = 0; /* ignore some start-up sanity checks, use it const SSL_METHOD* ssl_methods[TLS_USE_SSLv23 + 1]; +#ifdef NO_TLS_MALLOC_DBG #undef TLS_MALLOC_DBG /* extra malloc debug info from openssl */ +#endif /* NO_TLS_MALLOC_DBG */ + /* * Wrappers around SER shared memory functions * (which can be macros) */ #ifdef TLS_MALLOC_DBG +#warning "tls module compiled with malloc debugging info (extra overhead)" #include <execinfo.h> /*

14 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2010