sr-dev June 2011

sr-dev@lists.kamailio.org

32 participants
168 discussions

git:master: cfg framework: safety checks added
by Miklos Tirpak 24 Jun '11

24 Jun '11

Module: sip-router Branch: master Commit: 2ebc2cac489596f6b19bc1cebf25b57b1b69331c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ebc2ca… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Jun 3 14:37:03 2011 +0200 cfg framework: safety checks added Verify that the child process has a local configuration in the functions that work with config group instances. --- cfg/cfg_struct.c | 60 ++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 41 insertions(+), 19 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 6e93ca0..c10dd55 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -1100,26 +1100,28 @@ void cfg_move_handle(cfg_group_t *group, cfg_group_inst_t *src_ginst, cfg_group_ dst_ginst->vars : CFG_GROUP_DATA(cfg_local, group); - /* call the per child process callback of those variables - that have different value in the two group instances */ - /* TODO: performance optimization: this entire loop can be - skipped if the group does not have any variable with - per-child process callback. Use some flag in the group - structure for this purpose. */ - gname.s = group->name; - gname.len = group->name_len; - for (i = 0; i < CFG_MAX_VAR_NUM/(sizeof(int)*8); i++) { - bitmap = ((src_ginst) ? src_ginst->set[i] : 0U) - | ((dst_ginst) ? dst_ginst->set[i] : 0U); - while (bitmap) { - pos = bit_scan_forward32(bitmap); - var = &group->mapping[pos + i*sizeof(int)*8]; - if (var->def->on_set_child_cb) { - vname.s = var->def->name; - vname.len = var->name_len; - var->def->on_set_child_cb(&gname, &vname); + if (cfg_child_cb != CFG_NO_CHILD_CBS) { + /* call the per child process callback of those variables + that have different value in the two group instances */ + /* TODO: performance optimization: this entire loop can be + skipped if the group does not have any variable with + per-child process callback. Use some flag in the group + structure for this purpose. */ + gname.s = group->name; + gname.len = group->name_len; + for (i = 0; i < CFG_MAX_VAR_NUM/(sizeof(int)*8); i++) { + bitmap = ((src_ginst) ? src_ginst->set[i] : 0U) + | ((dst_ginst) ? dst_ginst->set[i] : 0U); + while (bitmap) { + pos = bit_scan_forward32(bitmap); + var = &group->mapping[pos + i*sizeof(int)*8]; + if (var->def->on_set_child_cb) { + vname.s = var->def->name; + vname.len = var->name_len; + var->def->on_set_child_cb(&gname, &vname); + } + bitmap -= (1U << pos); } - bitmap -= (1U << pos); } } /* keep track of how many group instences are set in the child process */ @@ -1140,6 +1142,11 @@ int cfg_select(cfg_group_t *group, unsigned int id) { cfg_group_inst_t *ginst; + if (!cfg_local) { + LOG(L_ERR, "ERROR: The child process has no local configuration\n"); + return -1; + } + if (!(ginst = cfg_find_group(CFG_GROUP_META(cfg_local, group), group->size, id)) @@ -1161,6 +1168,11 @@ int cfg_select(cfg_group_t *group, unsigned int id) /* Reset the group handle to the default, local configuration */ int cfg_reset(cfg_group_t *group) { + if (!cfg_local) { + LOG(L_ERR, "ERROR: The child process has no local configuration\n"); + return -1; + } + cfg_move_handle(group, CFG_HANDLE_TO_GINST(*(group->handle)), /* the active group instance */ NULL); @@ -1183,6 +1195,11 @@ int cfg_select_first(cfg_group_t *group) cfg_group_meta_t *meta; cfg_group_inst_t *ginst; + if (!cfg_local) { + LOG(L_ERR, "ERROR: The child process has no local configuration\n"); + return -1; + } + meta = CFG_GROUP_META(cfg_local, group); if (!meta || (meta->num == 0)) return -1; @@ -1212,6 +1229,11 @@ int cfg_select_next(cfg_group_t *group) cfg_group_inst_t *old_ginst, *new_ginst; int size; + if (!cfg_local) { + LOG(L_ERR, "ERROR: The child process has no local configuration\n"); + return -1; + } + if (!(meta = CFG_GROUP_META(cfg_local, group))) return -1;

1 0

git:master: cfg framework: set the local config in PROC_INIT
by Miklos Tirpak 24 Jun '11

24 Jun '11

Module: sip-router Branch: master Commit: 5d3449a06ac523575ba029325048efc20cd053b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d3449a… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Jun 7 20:58:38 2011 +0200 cfg framework: set the local config in PROC_INIT The local configuration of the main process is temporary set during initialization in child_init with rank==PROC_INIT, which makes the configuration group instances available for the modules. The local configuration is reset back to NULL afterwards to make sure that each child process updates its own config the usual way. --- cfg/cfg_struct.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ cfg/cfg_struct.h | 15 +++++++++++++++ main.c | 15 +++++++++++++++ 3 files changed, 74 insertions(+), 0 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index c10dd55..e07098a 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -95,6 +95,8 @@ cfg_group_t *cfg_new_group(char *name, int name_len, group->vars = vars; group->size = size; group->handle = handle; + if (handle) + group->orig_handle = *handle; group->name_len = name_len; memcpy(&group->name, name, name_len); @@ -115,6 +117,8 @@ void cfg_set_group(cfg_group_t *group, group->vars = vars; group->size = size; group->handle = handle; + if (handle) + group->orig_handle = *handle; } /* clones a string to shared memory @@ -1256,3 +1260,43 @@ int cfg_select_next(cfg_group_t *group) return 0; } +/* Temporary set the local configuration in the main process before forking. + * This makes the group instances usable in the main process after + * the configuration is shmized, but before the children are forked. + */ +void cfg_main_set_local(void) +{ + /* Disable the execution of child-process callbacks, + * they can cause trouble because the children inherit all the + * values later */ + cfg_child_cb = CFG_NO_CHILD_CBS; + cfg_update_no_cbs(); +} + +/* Reset the local configuration of the main process back to its original state + * to make sure that the forked processes are not affected. + */ +void cfg_main_reset_local(void) +{ + cfg_group_t *group; + + /* Unref the local config, and set it back to NULL. + * Each child will set its own local configuration. */ + if (cfg_local) { + CFG_UNREF(cfg_local); + cfg_local = NULL; + + /* restore the original value of the module handles */ + for ( group = cfg_group; + group; + group = group->next + ) + *(group->handle) = group->orig_handle; + /* The handle might have pointed to a group instance, + * reset the instance counter. */ + cfg_ginst_count = 0; + } + cfg_child_cb = NULL; +} + + diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index 2e91691..dca39a0 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -99,6 +99,10 @@ typedef struct _cfg_group { by the modules to access the variables. It is registered when the group is created, and updated every time the block is replaced */ + void *orig_handle; /*!< Original value that the handle points to + when the config group is registered. This is needed + to temporary set the handle in the main process and + restore it later to its original value. */ unsigned char dynamic; /*!< indicates whether the variables within the group are dynamically allocated or not */ @@ -534,4 +538,15 @@ int cfg_select_first(cfg_group_t *group); */ int cfg_select_next(cfg_group_t *group); +/* Temporary set the local configuration in the main process before forking. + * This makes the group instances usable in the main process after + * the configuration is shmized, but before the children are forked. + */ +void cfg_main_set_local(void); + +/* Reset the local configuration of the main process back to its original state + * to make sure that the forked processes are not affected. + */ +void cfg_main_reset_local(void); + #endif /* _CFG_STRUCT_H */ diff --git a/main.c b/main.c index 22ed613..2fcb40b 100644 --- a/main.c +++ b/main.c @@ -1310,6 +1310,11 @@ int main_loop() as new processes are forked (while skipping 0 reserved for main */ + /* Temporary set the local configuration of the main process + * to make the group instances available in PROC_INIT. + */ + cfg_main_set_local(); + /* init childs with rank==PROC_INIT before forking any process, * this is a place for delayed (after mod_init) initializations * (e.g. shared vars that depend on the total number of processes @@ -1320,8 +1325,10 @@ int main_loop() if (init_child(PROC_INIT) < 0) { LOG(L_ERR, "ERROR: main_dontfork: init_child(PROC_INT) --" " exiting\n"); + cfg_main_reset_local(); goto error; } + cfg_main_reset_local(); if (counters_prefork_init(get_max_procs()) == -1) goto error; #ifdef USE_SLOW_TIMER @@ -1523,6 +1530,12 @@ int main_loop() LOG(L_CRIT, "could not initialize shared configuration\n"); goto error; } + + /* Temporary set the local configuration of the main process + * to make the group instances available in PROC_INIT. + */ + cfg_main_set_local(); + /* init childs with rank==PROC_INIT before forking any process, * this is a place for delayed (after mod_init) initializations * (e.g. shared vars that depend on the total number of processes @@ -1533,8 +1546,10 @@ int main_loop() if (init_child(PROC_INIT) < 0) { LOG(L_ERR, "ERROR: main: error in init_child(PROC_INT) --" " exiting\n"); + cfg_main_reset_local(); goto error; } + cfg_main_reset_local(); if (counters_prefork_init(get_max_procs()) == -1) goto error;

1 0

git:master: doxygen: small bunch of fixes for doxygen documentation
by Henning Westerholt 23 Jun '11

23 Jun '11

Module: sip-router Branch: master Commit: ee47cfb6029ecc1d2340a3f90496de17e534d505 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee47cfb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jun 24 00:36:18 2011 +0200 doxygen: small bunch of fixes for doxygen documentation --- atomic_ops.h | 2 +- cfg_parser.h | 2 +- md5.c | 9 ++++----- md5.h | 7 +++++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/atomic_ops.h b/atomic_ops.h index 7b0d1f8..c2c0249 100644 --- a/atomic_ops.h +++ b/atomic_ops.h @@ -21,7 +21,7 @@ * \brief SIP-router core :: Atomic operations and memory barriers * \ingroup core * Module: \ref core - * See \ref atomicops + * See \ref atomic */ /* diff --git a/cfg_parser.h b/cfg_parser.h index 11296c5..8240d22 100644 --- a/cfg_parser.h +++ b/cfg_parser.h @@ -163,7 +163,7 @@ void cfg_parser_close(struct cfg_parser* st); struct cfg_option* cfg_lookup_token(struct cfg_option* options, str* token); -/*! ! \briefInterface to the lexical scanner */ +/*! ! \brief Interface to the lexical scanner */ int cfg_get_token(struct cfg_token* token, struct cfg_parser* st, unsigned int flags); /* Commonly needed parser functions */ diff --git a/md5.c b/md5.c index 1c628df..ab011da 100644 --- a/md5.c +++ b/md5.c @@ -35,7 +35,7 @@ /** - * \brief Constants for MD5Transform routine. + * \name Constants for MD5Transform routine */ /*@{ */ @@ -70,7 +70,7 @@ static unsigned char PADDING[64] = { }; /** - * \brief F, G, H and I are basic MD5 functions. + * \name F, G, H and I are basic MD5 functions */ /*@{ */ @@ -81,13 +81,12 @@ static unsigned char PADDING[64] = { /*@} */ /** - * \brief ROTATE_LEFT rotates x left n bits. + * \brief ROTATE_LEFT rotates x left n bits */ #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) /** - * \brief FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. - * + * \name FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 * FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. * Rotation is separate from addition to prevent recomputation. */ diff --git a/md5.h b/md5.h index 756a96e..d4fa2de 100644 --- a/md5.h +++ b/md5.h @@ -21,6 +21,13 @@ * documentation and/or software. */ +/*! + * \file + * \brief SIP-router core :: md5 hash support + * \ingroup core + * Module: \ref core + */ + #ifndef MD5_H #define MD5_H

1 0

git:master: doxygen: convert existing documentation to doxygen, small whitespace cleanup
by Henning Westerholt 23 Jun '11

23 Jun '11

Module: sip-router Branch: master Commit: 82a2e00d83e3c991e5275c78d6e75cf28e780e62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82a2e00… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jun 24 00:25:09 2011 +0200 doxygen: convert existing documentation to doxygen, small whitespace cleanup --- md5.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++---------------- md5.h | 76 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 119 insertions(+), 49 deletions(-) diff --git a/md5.c b/md5.c index 92f3273..1c628df 100644 --- a/md5.c +++ b/md5.c @@ -23,7 +23,7 @@ /*! * \file - * \brief SIP-router core :: + * \brief SIP-router core :: md5 hash support * \ingroup core * Module: \ref core */ @@ -34,9 +34,11 @@ #include "md5.h" -/* Constants for MD5Transform routine. +/** + * \brief Constants for MD5Transform routine. */ +/*@{ */ #define S11 7 #define S12 12 #define S13 17 @@ -53,6 +55,7 @@ #define S42 10 #define S43 15 #define S44 21 +/*@} */ static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64])); static void Encode PROTO_LIST @@ -66,20 +69,30 @@ static unsigned char PADDING[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -/* F, G, H and I are basic MD5 functions. +/** + * \brief F, G, H and I are basic MD5 functions. */ + +/*@{ */ #define F(x, y, z) (((x) & (y)) | ((~x) & (z))) #define G(x, y, z) (((x) & (z)) | ((y) & (~z))) #define H(x, y, z) ((x) ^ (y) ^ (z)) #define I(x, y, z) ((y) ^ ((x) | (~z))) +/*@} */ -/* ROTATE_LEFT rotates x left n bits. +/** + * \brief ROTATE_LEFT rotates x left n bits. */ #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) -/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. -Rotation is separate from addition to prevent recomputation. +/** + * \brief FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. + * + * FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4. + * Rotation is separate from addition to prevent recomputation. */ + +/*@{ */ #define FF(a, b, c, d, x, s, ac) { \ (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \ (a) = ROTATE_LEFT ((a), (s)); \ @@ -100,11 +113,16 @@ Rotation is separate from addition to prevent recomputation. (a) = ROTATE_LEFT ((a), (s)); \ (a) += (b); \ } +/*@} */ -/* MD5 initialization. Begins an MD5 operation, writing a new context. +/** + * \brief MD5 context initialization + * + * MD5 context initialization. Begins an MD5 operation, writing a new context. + * \param context initialized context */ void MD5Init (context) -MD5_CTX *context; /* context */ +MD5_CTX *context; { context->count[0] = context->count[1] = 0; /* Load magic initialization constants. @@ -115,14 +133,20 @@ MD5_CTX *context; /* context */ context->state[3] = 0x10325476; } -/* MD5 block update operation. Continues an MD5 message-digest - operation, processing another message block, and updating the - context. +/** + * \brief MD5 block update operation + * + * MD5 block update operation. Continues an MD5 message-digest + * operation, processing another message block, and updating the + * context. + * \param context context + * \param input input block + * \param inputLen length of input block */ void MD5Update (context, input, inputLen) -MD5_CTX *context; /* context */ -unsigned char *input; /* input block */ -unsigned int inputLen; /* length of input block */ +MD5_CTX *context; +unsigned char *input; +unsigned int inputLen; { unsigned int i, index, partLen; @@ -159,12 +183,17 @@ unsigned int inputLen; /* length of input block */ inputLen-i); } -/* MD5 finalization. Ends an MD5 message-digest operation, writing the - the message digest and zeroizing the context. +/** + * \brief MD5 finalization + * + * MD5 finalization. Ends an MD5 message-digest operation, writing the + * the message digest and zeroizing the context. + * \param digest message digest + * \param context context */ void MD5Final (digest, context) -unsigned char digest[16]; /* message digest */ -MD5_CTX *context; /* context */ +unsigned char digest[16]; +MD5_CTX *context; { unsigned char bits[8]; unsigned int index, padLen; @@ -189,7 +218,12 @@ MD5_CTX *context; /* context */ memset ((POINTER)context, 0, sizeof (*context)); } -/* MD5 basic transformation. Transforms state based on block. +/** + * \brief MD5 basic transformation + * + * MD5 basic transformation. Transforms state based on block. + * \param state transformed state + * \param block block input for transformation */ static void MD5Transform (state, block) UINT4 state[4]; @@ -281,8 +315,14 @@ unsigned char block[64]; memset ((POINTER)x, 0, sizeof (x)); } -/* Encodes input (UINT4) into output (unsigned char). Assumes len is - a multiple of 4. +/** + * \brief Encodes input (UINT4) into output (unsigned char) + * + * Encodes input (UINT4) into output (unsigned char). Assumes len is + * a multiple of 4. + * \param output output character + * \param input integer input + * \param len length of output */ static void Encode (output, input, len) unsigned char *output; @@ -299,8 +339,14 @@ unsigned int len; } } -/* Decodes input (unsigned char) into output (UINT4). Assumes len is - a multiple of 4. +/** + * \brief Decodes input (unsigned char) into output (UINT4) + * + * Decodes input (unsigned char) into output (UINT4). Assumes len is + * a multiple of 4. + * \param output output integer + * \param input input character + * \param len length of input */ static void Decode (output, input, len) UINT4 *output; diff --git a/md5.h b/md5.h index ac53da7..756a96e 100644 --- a/md5.h +++ b/md5.h @@ -1,28 +1,24 @@ -/* MD5.H - header file for MD5C.C - * $Id$ - */ - - -/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All -rights reserved. - -License to copy and use this software is granted provided that it -is identified as the "RSA Data Security, Inc. MD5 Message-Digest -Algorithm" in all material mentioning or referencing this software -or this function. - -License is also granted to make and use derivative works provided -that such works are identified as "derived from the RSA Data -Security, Inc. MD5 Message-Digest Algorithm" in all material -mentioning or referencing the derived work. - -RSA Data Security, Inc. makes no representations concerning either -the merchantability of this software or the suitability of this -software for any particular purpose. It is provided "as is" -without express or implied warranty of any kind. - -These notices must be retained in any copies of any part of this -documentation and/or software. +/* + * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All + * rights reserved. + * + * License to copy and use this software is granted provided that it + * is identified as the "RSA Data Security, Inc. MD5 Message-Digest + * Algorithm" in all material mentioning or referencing this software + * or this function. + * + * License is also granted to make and use derivative works provided + * that such works are identified as "derived from the RSA Data + * Security, Inc. MD5 Message-Digest Algorithm" in all material + * mentioning or referencing the derived work. + * + * RSA Data Security, Inc. makes no representations concerning either + * the merchantability of this software or the suitability of this + * software for any particular purpose. It is provided "as is" + * without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. */ #ifndef MD5_H @@ -30,16 +26,44 @@ documentation and/or software. #include "md5global.h" -/* MD5 context. */ +/** + * \brief MD5 context + */ typedef struct { UINT4 state[4]; /* state (ABCD) */ UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */ unsigned char buffer[64]; /* input buffer */ } MD5_CTX; +/** + * \brief MD5 context initialization + * + * MD5 context initialization. Begins an MD5 operation, writing a new context. + * \param context initialized context + */ void MD5Init PROTO_LIST ((MD5_CTX *)); + +/** + * \brief MD5 block update operation + * + * MD5 block update operation. Continues an MD5 message-digest + * operation, processing another message block, and updating the + * context. + * \param context context + * \param input input block + * \param inputLen length of input block + */ void MD5Update PROTO_LIST ((MD5_CTX *, unsigned char *, unsigned int)); + + /** + * \brief MD5 finalization + * + * MD5 finalization. Ends an MD5 message-digest operation, writing the + * the message digest and zeroizing the context. + * \param digest message digest + * \param context context + */ void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *)); #endif /* MD5_H */

1 0

git:master: core: replace redundant for-loop memset/ memcpy with standard ( faster) libc versions
by Henning Westerholt 23 Jun '11

23 Jun '11

Module: sip-router Branch: master Commit: 1ecf8867f4310ac47e8d52421930c9fd00dfc693 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ecf886… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jun 24 00:04:01 2011 +0200 core: replace redundant for-loop memset/ memcpy with standard (faster) libc versions --- md5.c | 97 ++++++++++++++++------------------------------------------------- 1 files changed, 24 insertions(+), 73 deletions(-) diff --git a/md5.c b/md5.c index 28fef81..92f3273 100644 --- a/md5.c +++ b/md5.c @@ -1,29 +1,24 @@ /* - -$Id$ - -MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - -Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All -rights reserved. - -License to copy and use this software is granted provided that it -is identified as the "RSA Data Security, Inc. MD5 Message-Digest -Algorithm" in all material mentioning or referencing this software -or this function. - -License is also granted to make and use derivative works provided -that such works are identified as "derived from the RSA Data -Security, Inc. MD5 Message-Digest Algorithm" in all material -mentioning or referencing the derived work. - -RSA Data Security, Inc. makes no representations concerning either -the merchantability of this software or the suitability of this -software for any particular purpose. It is provided "as is" -without express or implied warranty of any kind. - -These notices must be retained in any copies of any part of this -documentation and/or software. + * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm + * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All + * rights reserved. + * License to copy and use this software is granted provided that it + * is identified as the "RSA Data Security, Inc. MD5 Message-Digest + * Algorithm" in all material mentioning or referencing this software + * or this function. + * + * License is also granted to make and use derivative works provided + * that such works are identified as "derived from the RSA Data + * Security, Inc. MD5 Message-Digest Algorithm" in all material + * mentioning or referencing the derived work. + * + * RSA Data Security, Inc. makes no representations concerning either + * the merchantability of this software or the suitability of this + * software for any particular purpose. It is provided "as is" + * without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. */ /*! @@ -39,14 +34,9 @@ documentation and/or software. #include "md5.h" -#define USE_MEM - /* Constants for MD5Transform routine. */ - - - #define S11 7 #define S12 12 #define S13 17 @@ -69,8 +59,6 @@ static void Encode PROTO_LIST ((unsigned char *, UINT4 *, unsigned int)); static void Decode PROTO_LIST ((UINT4 *, unsigned char *, unsigned int)); -static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int)); -static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int)); static unsigned char PADDING[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -153,7 +141,7 @@ unsigned int inputLen; /* length of input block */ /* Transform as many times as possible. */ if (inputLen >= partLen) { - MD5_memcpy + memcpy ((POINTER)&context->buffer[index], (POINTER)input, partLen); MD5Transform (context->state, context->buffer); @@ -166,7 +154,7 @@ unsigned int inputLen; /* length of input block */ i = 0; /* Buffer remaining input */ - MD5_memcpy + memcpy ((POINTER)&context->buffer[index], (POINTER)&input[i], inputLen-i); } @@ -198,7 +186,7 @@ MD5_CTX *context; /* context */ /* Zeroize sensitive information. */ - MD5_memset ((POINTER)context, 0, sizeof (*context)); + memset ((POINTER)context, 0, sizeof (*context)); } /* MD5 basic transformation. Transforms state based on block. @@ -290,7 +278,7 @@ unsigned char block[64]; /* Zeroize sensitive information. */ - MD5_memset ((POINTER)x, 0, sizeof (x)); + memset ((POINTER)x, 0, sizeof (x)); } /* Encodes input (UINT4) into output (unsigned char). Assumes len is @@ -325,40 +313,3 @@ unsigned int len; output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) | (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24); } - -/* Note: Replace "for loop" with standard memcpy if possible. - */ - -static void MD5_memcpy (output, input, len) -POINTER output; -POINTER input; -unsigned int len; -{ - -#ifndef USE_MEM - unsigned int i; - - for (i = 0; i < len; i++) - output[i] = input[i]; -#else - memcpy( output, input, len ); -#endif -} - -/* Note: Replace "for loop" with standard memset if possible. - */ -static void MD5_memset (output, value, len) -POINTER output; -int value; -unsigned int len; -{ - -#ifndef USE_MEM - unsigned int i; - for (i = 0; i < len; i++) - ((char *)output)[i] = (char)value; -#else - memset( output, value, len ); -#endif -} -

1 0

git:master: rand: fix warnings: call to function ‘ .. ’ without a real prototype from gcc 4 .5
by Henning Westerholt 23 Jun '11

23 Jun '11

Module: sip-router Branch: master Commit: 6aef49b836f75d180a555973a03cf9e981e9994d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6aef49b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jun 23 23:58:13 2011 +0200 rand: fix warnings: call to function ‘..’ without a real prototype from gcc 4.5 --- rand/isaac/rand.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rand/isaac/rand.h b/rand/isaac/rand.h index 7361705..018496f 100644 --- a/rand/isaac/rand.h +++ b/rand/isaac/rand.h @@ -36,9 +36,9 @@ typedef struct randctx randctx; If (flag==TRUE), then use the contents of randrsl[0..RANDSIZ-1] as the seed. ------------------------------------------------------------------------------ */ -void randinit(/*_ randctx *r, word flag _*/); +void randinit(randctx *r, word flag); -void isaac(/*_ randctx *r _*/); +void isaac(randctx *r); /*

1 0

git:master: doxygen: convert existing docs to use proper doxygen structures and groups, small cleanups
by Henning Westerholt 23 Jun '11

23 Jun '11

Module: sip-router Branch: master Commit: 6aaba8e96fc87e1938b7abfdb5964714e4adfa3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6aaba8e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jun 23 23:39:01 2011 +0200 doxygen: convert existing docs to use proper doxygen structures and groups, small cleanups --- atomic/atomic_alpha.h | 22 ++++++++++++---------- atomic/atomic_arm.h | 25 ++++++++++++++----------- atomic/atomic_common.h | 38 +++++++++++++++++++++++++++++--------- atomic/atomic_mips2.h | 29 +++++++++++++++-------------- atomic/atomic_native.h | 41 +++++++++++++++++++++-------------------- atomic/atomic_ppc.h | 25 +++++++++++++++---------- atomic/atomic_sparc.h | 15 +++++++++------ atomic/atomic_sparc64.h | 22 ++++++++++++---------- atomic/atomic_unknown.h | 27 +++++++++++++++------------ atomic/atomic_x86.h | 29 +++++++++++++++-------------- 10 files changed, 157 insertions(+), 116 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6aa…

1 0

git:master: doxygen: add missing group definition to dialog module
by Henning Westerholt 23 Jun '11

23 Jun '11

Module: sip-router Branch: master Commit: f992d9b4549d858944b620195611940ce1cf42b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f992d9b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jun 23 23:32:50 2011 +0200 doxygen: add missing group definition to dialog module --- modules_k/dialog/dialog.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 839cf2f..79688a8 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -38,6 +38,19 @@ * 2010-06-16 added sip-router rpc interface (osas) */ +/** + * @defgroup dialog dialog :: Kamailio dialog module + * @brief Kamailio dialog module + * + * The dialog module provides dialog awareness to the Kamailio proxy. Its + * functionality is to keep track of the current dialogs, to offer + * information about them (like how many dialogs are active) or to manage + * them. The module exports several functions that could be used directly + * from scripts. + * The module, via an internal API, also provide the foundation to build + * on top of it more complex dialog-based functionalities via other + * Kamailio modules. + */ #include <stdio.h> #include <string.h>

1 0

git:master: doxygen: some fixes in tls module
by Henning Westerholt 23 Jun '11

23 Jun '11

Module: sip-router Branch: master Commit: 5f44f76c2881bcecfda860e795baadcf523808c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f44f76… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jun 23 23:08:41 2011 +0200 doxygen: some fixes in tls module --- modules/tls/tls_bio.c | 7 +++++-- modules/tls/tls_cfg.h | 7 +++++-- modules/tls/tls_ct_wrq.h | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/tls/tls_bio.c b/modules/tls/tls_bio.c index 1013bf7..603caa8 100644 --- a/modules/tls/tls_bio.c +++ b/modules/tls/tls_bio.c @@ -15,11 +15,14 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/** openssl BIOs for reading/writing via a fixed memory buffer. - * @file /home/andrei/sr.git/modules/tls/tls_bio.c + +/** + * openssl BIOs for reading/writing via a fixed memory buffer. + * @file * @ingroup tls * @Module: @ref tls */ + /* * History: * -------- diff --git a/modules/tls/tls_cfg.h b/modules/tls/tls_cfg.h index e86709e..86b8816 100644 --- a/modules/tls/tls_cfg.h +++ b/modules/tls/tls_cfg.h @@ -15,11 +15,14 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/** tls runtime configuration. - * @filetls_cfg.h + +/** + * TLS runtime configuration. + * @file tls_cfg.h * @ingroup: tls * Module: @ref tls */ + /* * History: * -------- diff --git a/modules/tls/tls_ct_wrq.h b/modules/tls/tls_ct_wrq.h index 23ee8d2..56443f0 100644 --- a/modules/tls/tls_ct_wrq.h +++ b/modules/tls/tls_ct_wrq.h @@ -15,11 +15,13 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + /** . - * @file /home/andrei/sr.git/modules/tls/tls_ct_wrq.h + * @file * @ingroup: * Module: */ + /* * History: * --------

1 0

git:master: doxygen: small syntax fix in cfg support and sl module
by Henning Westerholt 23 Jun '11

23 Jun '11

Module: sip-router Branch: master Commit: 09b8aec4d4296354aaaa36abbafea9c834492778 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09b8aec… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jun 23 22:03:43 2011 +0200 doxygen: small syntax fix in cfg support and sl module --- cfg/cfg_struct.h | 2 +- modules/sl/sl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index d3231dc..f835a7e 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -118,7 +118,7 @@ typedef struct _cfg_group_inst { unsigned char vars[1]; /*!< block for the values */ } cfg_group_inst_t; -/*! \bried Meta-data which is stored before each variable group +/*! \brief Meta-data which is stored before each variable group * within the blob. This structure is used to handle the multivalue * instances of the variables, i.e. manages the array for the * additional values. */ diff --git a/modules/sl/sl.h b/modules/sl/sl.h index 8a133ed..892c43b 100644 --- a/modules/sl/sl.h +++ b/modules/sl/sl.h @@ -60,7 +60,7 @@ typedef struct sl_cbp { typedef void (*sl_cbf_f)(sl_cbp_t *slcbp); /** - * @bried SL callback structure definition + * @brief SL callback structure definition */ typedef struct sl_cbelem { unsigned int type; /* type of callback - can be a mask of types */

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2011