sr-dev May 2010

sr-dev@lists.kamailio.org

18 participants
140 discussions

git:andrei/tcp_tls_changes: tls: tls_bio ctrl cmd support, fixes and debug

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: c6a9ffb4f6a7b2e9f777ed47e87749eacf9782b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6a9ffb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 20 17:44:13 2010 +0200 tls: tls_bio ctrl cmd support, fixes and debug - proper return code for some BIO_ctrl commands used internally by SSL_*. (BIO_CTRL_DUP, BIO_CTRL_FLUSH) - when the attached memory buffer is null and read or write is attempted, behave similar to socket bio on EAGAIN (BIO_set_retry_read(b)). - fixed tls_bio_mbuf_read bug (switched params in memcpy). - added tls_mbuf_init(...) - extended debug messages if TLS_BIO_DEBUG is defined. --- modules/tls/tls_bio.c | 87 +++++++++++++++++++++++++++++++++++++++++++++---- modules/tls/tls_bio.h | 24 ++++++++++++-- 2 files changed, 101 insertions(+), 10 deletions(-) diff --git a/modules/tls/tls_bio.c b/modules/tls/tls_bio.c index a7ba50d..c82fe64 100644 --- a/modules/tls/tls_bio.c +++ b/modules/tls/tls_bio.c @@ -24,6 +24,8 @@ * History: * -------- * 2010-03-25 initial version (andrei) + * 2010-05-20 emulate EAGAIN on null rd/wr memory buffer; handle some + * needed commands in ctrl; debug support (TLS_BIO_DBG) (andrei) */ #include "tls_bio.h" @@ -35,6 +37,26 @@ internal defined BIO is 23) */ #define BIO_TYPE_TLS_MBUF (BIO_TYPE_SOURCE_SINK | 0xf2) +/* debugging */ +#ifndef NO_TLS_BIO_DEBUG +#define TLS_BIO_DEBUG +#endif +#ifdef TLS_BIO_DEBUG + #ifdef __SUNPRO_C + #define TLS_BIO_DBG(...) \ + LOG_(DEFAULT_FACILITY, L_INFO, "tls_BIO: " LOC_INFO, __VA_ARGS__) + #else + #define TLS_BIO_DBG(fmt, args...) \ + LOG_(DEFAULT_FACILITY, L_INFO, "tls_BIO: " LOC_INFO, fmt, ## args) + #endif /* __SUNPRO_c */ +#else /* TLS_BIO_DEBUG */ + #ifdef __SUNPRO_C + #define TLS_BIO_DBG(...) + #else + #define TLS_BIO_DBG(fmt, args...) + #endif /* __SUNPRO_c */ +#endif /* TLS_BIO_DEBUG */ + static int tls_bio_mbuf_new(BIO* b); static int tls_bio_mbuf_free(BIO* b); @@ -73,6 +95,7 @@ BIO* tls_BIO_new_mbuf(struct tls_mbuf* rd, struct tls_mbuf* wr) { BIO* ret; + TLS_BIO_DBG("tls_BIO_new_mbuf called (%p, %p)\n", rd, wr); ret = BIO_new(tls_BIO_mbuf()); if (unlikely(ret == 0)) return 0; @@ -92,6 +115,7 @@ int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr) { struct tls_bio_mbuf_data* d; + TLS_BIO_DBG("tls_BIO_muf_set called (%p, %p)\n", rd, wr); if (unlikely(b->ptr == 0)){ BUG("null BIO ptr\n"); return 0; @@ -113,6 +137,7 @@ static int tls_bio_mbuf_new(BIO* b) { struct tls_bio_mbuf_data* d; + TLS_BIO_DBG("tls_bio_mbuf_new called (%p)\n", b); b->init = 0; /* not initialized yet */ b->num = 0; b->ptr = 0; @@ -134,6 +159,7 @@ static int tls_bio_mbuf_new(BIO* b) */ static int tls_bio_mbuf_free(BIO* b) { + TLS_BIO_DBG("tls_bio_mbuf_free called (%p)\n", b); if (unlikely( b == 0)) return 0; if (likely(b->ptr)){ @@ -164,19 +190,30 @@ static int tls_bio_mbuf_read(BIO* b, char* dst, int dst_len) if (unlikely(d == 0 || d->rd->buf == 0)) { if (d == 0) BUG("tls_BIO_mbuf %p: read called with null b->ptr\n", b); - else - BUG("tls_BIO_mbuf %p: read called with null read buffer\n", b); + else { + /* this form of calling read with a null buffer is used + as a shortcut when no data is available => + simulate EAGIAN/WANT_READ */ + TLS_BIO_DBG("read (%p, %p, %d) called with null read buffer" + " => simulating EAGAIN/WANT_READ\n", b, dst, dst_len); + BIO_set_retry_read(b); + } return -1; } rd = d->rd; if (unlikely(rd->used == rd->pos && dst_len)) { /* mimic non-blocking read behaviour */ + TLS_BIO_DBG("read (%p, %p, %d) called with full rd (%d)" + " => simulating EAGAIN/WANT_READ\n", + b, dst, dst_len, rd->used); BIO_set_retry_read(b); return -1; } ret = MIN_int(rd->used - rd->pos, dst_len); /* copy data from rd.buf into dst */ - memcpy(rd->buf+rd->pos, dst, ret); + memcpy(dst, rd->buf+rd->pos, ret); + TLS_BIO_DBG("read(%p, %p, %d) called with rd=%p pos=%d => %d bytes\n", + b, dst, dst_len, rd->buf, rd->pos, ret); rd->pos += ret; /* if (unlikely(rd->pos < rd->used)) BIO_set_retry_read(b); @@ -204,13 +241,21 @@ static int tls_bio_mbuf_write(BIO* b, const char* src, int src_len) if (unlikely(d == 0 || d->wr->buf == 0)) { if (d == 0) BUG("tls_BIO_mbuf %p: write called with null b->ptr\n", b); - else - BUG("tls_BIO_mbuf %p: write called with null read buffer\n", b); + else { + /* this form of calling write with a null buffer is used + as a shortcut when no data is available => + simulate EAGAIN/WANT_WRITE */ + TLS_BIO_DBG("write (%p, %p, %d) called with null buffer" + " => simulating WANT_WRITE\n", b, src, src_len); + BIO_set_retry_write(b); + } return -1; } wr = d->wr; if (unlikely(wr->size == wr->used && src_len)) { /* mimic non-blocking socket behaviour */ + TLS_BIO_DBG("write (%p, %p, %d) called with full wr buffer (%d)" + " => simulating WANT_WRITE\n", b, src, src_len, wr->used); BIO_set_retry_write(b); return -1; } @@ -220,6 +265,7 @@ static int tls_bio_mbuf_write(BIO* b, const char* src, int src_len) /* if (unlikely(ret < src_len)) BIO_set_retry_write(); */ + TLS_BIO_DBG("write called (%p, %p, %d) => %d\n", b, src, src_len, ret); return ret; } @@ -227,8 +273,34 @@ static int tls_bio_mbuf_write(BIO* b, const char* src, int src_len) static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2) { - /* no cmd supported */ - return 0; + long ret; + ret=0; + switch(cmd) { + case BIO_C_SET_FD: + case BIO_C_GET_FD: + ret = -1; /* error, not supported */ + break; + case BIO_CTRL_GET_CLOSE: + case BIO_CTRL_SET_CLOSE: + ret = 0; + break; + case BIO_CTRL_DUP: + case BIO_CTRL_FLUSH: + ret = 1; + break; + case BIO_CTRL_RESET: + case BIO_C_FILE_SEEK: + case BIO_C_FILE_TELL: + case BIO_CTRL_INFO: + case BIO_CTRL_PENDING: + case BIO_CTRL_WPENDING: + default: + ret = 0; + break; + } + TLS_BIO_DBG("ctrl called (%p, %d, %ld, %p) => %ld\n", + b, cmd, arg1, arg2, ret); + return ret; } @@ -237,6 +309,7 @@ static int tls_bio_mbuf_puts(BIO* b, const char* s) { int len; + TLS_BIO_DBG("puts called (%p, %s)\n", b, s); len=strlen(s); return tls_bio_mbuf_write(b, s, len); } diff --git a/modules/tls/tls_bio.h b/modules/tls/tls_bio.h index 78d5a47..5336d6b 100644 --- a/modules/tls/tls_bio.h +++ b/modules/tls/tls_bio.h @@ -34,9 +34,9 @@ /* memory buffer used for tls I/O */ struct tls_mbuf { unsigned char* buf; - int pos; /* current position in the buffer while reading*/ - int used; /* how much it's used */ - int size; /* total buffer size (fixed) */ + int pos; /**< current position in the buffer while reading or writing*/ + int used; /**< how much it's used (read or write)*/ + int size; /**< total buffer size (fixed) */ }; struct tls_bio_mbuf_data { @@ -49,6 +49,24 @@ BIO_METHOD* tls_BIO_mbuf(void); BIO* tls_BIO_new_mbuf(struct tls_mbuf* rd, struct tls_mbuf* wr); int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr); + + +/** intialize an mbuf structure. + * @param mb - struct tls_mbuf pointer that will be intialized. + * @param b - buffer (unsigned char*). + * @param sz - suze of the buffer (int). + * WARNING: the buffer will not be copied, but referenced. + */ +#define tls_mbuf_init(mb, b, sz) \ + do { \ + (mb)->buf = (b); \ + (mb)->size = (sz); \ + (mb)->pos = 0; \ + (mb)->used = 0; \ + } while(0) + + + #endif /*__tls_bio_h*/ /* vi: set ts=4 sw=4 tw=79:ai:cindent: */

13 years, 11 months

git:andrei/tcp_tls_changes: tls: clear text write queue implementation

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: c38de320d864507b38d6f99beb649fef9211a3cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c38de32… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 20 16:26:22 2010 +0200 tls: clear text write queue implementation In some cases the not-yet-encrypted data must be queued on write and the write retried later (e.g. a SSL_write returns WANT_READ because of an ongoing re-keying or trying to write while the SSL connection is not yet fully established). --- modules/tls/tls_ct_q.h | 131 ++++++++++++++++++++++++++++++++++++ modules/tls/tls_ct_wrq.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++ modules/tls/tls_ct_wrq.h | 53 +++++++++++++++ 3 files changed, 348 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c38…

13 years, 11 months

git:andrei/tcp_tls_changes: tls: added a minimum overhead shm buffer queue

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: c914809c9f70fe15d1a2459fa0668d722d83726c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c914809… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 20 16:22:16 2010 +0200 tls: added a minimum overhead shm buffer queue Minimum overhead buffer queue in shm memory, based on tcp_wbuffer_queue (tcp_conn.h). --- modules/tls/sbufq.h | 292 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 292 insertions(+), 0 deletions(-) diff --git a/modules/tls/sbufq.h b/modules/tls/sbufq.h new file mode 100644 index 0000000..6b59751 --- /dev/null +++ b/modules/tls/sbufq.h @@ -0,0 +1,292 @@ +/* + * $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. + */ +/** minimal overhead buffer queue in shm memory. + * @file modules/tls/sbufq.h + * @ingroup: tls + * Module: @ref tls + */ +/* + * History: + * -------- + * 2010-03-31 initial version, based on tcp_conn.h tcp_wbuffer_queue (andrei) +*/ + +#ifndef __sbufq_h +#define __sbufq_h + +#include "../../compiler_opt.h" +#include "../../ut.h" +#include "../../mem/shm_mem.h" +#include "../../timer_ticks.h" +#include "../../timer.h" +#include "../../dprint.h" +#include <string.h> + + +struct sbuf_elem { + struct sbuf_elem* next; + unsigned int b_size; /**< buf size */ + char buf[1]; /**< variable size buffer */ +}; + +struct sbuffer_queue { + struct sbuf_elem* first; + struct sbuf_elem* last; + ticks_t last_chg; /**< last change (creation time or partial flush)*/ + unsigned int queued; /**< total size */ + unsigned int offset; /**< offset in the first buffer where unflushed data + starts */ + unsigned int last_used; /**< how much of the last buffer is used */ +}; + + +/* sbufq_flush() output flags */ +#define F_BUFQ_EMPTY 1 +#define F_BUFQ_ERROR_FLUSH 2 + + +#define sbufq_empty(bq) ((bq)->first==0) +#define sbufq_non_empty(bq) ((bq)->first!=0) + + + +/** adds/appends data to a buffer queue. + * WARNING: it does no attempt to synchronize access/lock. If needed it should + * be called under lock. + * @param q - buffer queue + * @param data + * @param size + * @param min_buf_size - min size to allocate for new buffer elements + * @return 0 on success, -1 on error (mem. allocation) + */ +inline static int sbufq_add(struct sbuffer_queue* q, const void* data, + unsigned int size, unsigned int min_buf_size) +{ + struct sbuf_elem* b; + unsigned int last_free; + unsigned int b_size; + unsigned int crt_size; + ticks_t t; + + t=get_ticks_raw(); + + if (likely(q->last==0)) { + b_size=MAX_unsigned(min_buf_size, size); + b=shm_malloc(sizeof(*b)+b_size-sizeof(b->buf)); + if (unlikely(b==0)) + goto error; + b->b_size=b_size; + b->next=0; + q->last=b; + q->first=b; + q->last_used=0; + q->offset=0; + q->last_chg=get_ticks_raw(); + last_free=b_size; + crt_size=size; + goto data_cpy; + }else{ + b=q->last; + } + + while(size){ + last_free=b->b_size-q->last_used; + if (last_free==0){ + b_size=MAX_unsigned(min_buf_size, size); + b=shm_malloc(sizeof(*b)+b_size-sizeof(b->buf)); + if (unlikely(b==0)) + goto error; + b->b_size=b_size; + b->next=0; + q->last->next=b; + q->last=b; + q->last_used=0; + last_free=b->b_size; + } + crt_size=MIN_unsigned(last_free, size); +data_cpy: + memcpy(b->buf+q->last_used, data, crt_size); + q->last_used+=crt_size; + size-=crt_size; + data+=crt_size; + q->queued+=crt_size; + } + return 0; +error: + return -1; +} + + + +/** inserts data (at the beginning) in a buffer queue. + * Note: should never be called after sbufq_run(). + * WARNING: it does no attempt to synchronize access/lock. If needed it should + * be called under lock. + * @param q - buffer queue + * @param data + * @param size + * @param min_buf_size - min size to allocate for new buffer elements + * @return 0 on success, -1 on error (mem. allocation) + */ +inline static int sbufq_insert(struct sbuffer_queue* q, const void* data, + unsigned int size, unsigned int min_buf_size) +{ + struct sbuf_elem* b; + + if (likely(q->first==0)) /* if empty, use sbufq_add */ + return sbufq_add(q, data, size, min_buf_size); + + if (unlikely(q->offset)){ + LOG(L_CRIT, "BUG: non-null offset %d (bad call, should" + "never be called after sbufq_run())\n", q->offset); + goto error; + } + if ((q->first==q->last) && ((q->last->b_size-q->last_used)>=size)){ + /* one block with enough space in it for size bytes */ + memmove(q->first->buf+size, q->first->buf, size); + memcpy(q->first->buf, data, size); + q->last_used+=size; + }else{ + /* create a size bytes block directly */ + b=shm_malloc(sizeof(*b)+size-sizeof(b->buf)); + if (unlikely(b==0)) + goto error; + b->b_size=size; + /* insert it */ + b->next=q->first; + q->first=b; + memcpy(b->buf, data, size); + } + + q->queued+=size; + return 0; +error: + return -1; +} + + +/** destroy a buffer queue. + * Only the content is destroyed (shm_free()'d), the queue head is + * re-intialized. + * WARNING: it does no attempt to synchronize access/lock. If needed it should + * be called under lock. + * @param q - buffer queue + * @return - number of bytes that used to be queued (>=0). + */ +inline static unsigned int sbufq_destroy(struct sbuffer_queue* q) +{ + struct sbuf_elem* b; + struct sbuf_elem* next_b; + int unqueued; + + unqueued=0; + if (likely(q->first)){ + b=q->first; + do{ + next_b=b->next; + unqueued+=(b==q->last)?q->last_used:b->b_size; + if (b==q->first) + unqueued-=q->offset; + shm_free(b); + b=next_b; + }while(b); + } + memset(q, 0, sizeof(*q)); + return unqueued; +} + + + +/** tries to flush the queue. + * Tries to flush as much as possible from the given queue, using the + * given callback. + * WARNING: it does no attempt to synchronize access/lock. If needed it should + * be called under lock. + * @param q - buffer queue + * @param *flags - set to: + * F_BUFQ_EMPTY if the queued is completely flushed + * F_BUFQ_ERROR_FLUSH if the flush_f callback returned error. + * @param flush_f - flush function (callback). modeled after write(): + * flush_f(param1, param2, const void* buf, unsigned size). + * It should return the number of bytes "flushed" on + * success, or <0 on error. If the number of bytes + * "flushed" is smaller then the requested size, it + * would be assumed that no more bytes can be flushed + * and sbufq_flush will exit. + * @param flush_p1 - parameter for the flush function callback. + * @param flush_p2 - parameter for the flush function callback. + * @return -1 on internal error, or the number of bytes flushed on + * success (>=0). Note that the flags param is + * always set and it should be used to check for errors, since + * a flush_f() failure will not result in a negative return. + */ +inline static int sbufq_flush(struct sbuffer_queue* q, int* flags, + int (*flush_f)(void* p1, void* p2, + const void* buf, + unsigned size), + void* flush_p1, void* flush_p2) +{ + struct sbuf_elem *b; + int n; + int ret; + int block_size; + char* buf; + + *flags=0; + ret=0; + while(q->first){ + block_size=((q->first==q->last)?q->last_used:q->first->b_size)- + q->offset; + buf=q->first->buf+q->offset; + n=flush_f(flush_p1, flush_p2, buf, block_size); + if (likely(n>0)){ + ret+=n; + if (likely(n==block_size)){ + b=q->first; + q->first=q->first->next; + shm_free(b); + q->offset=0; + q->queued-=block_size; + ret+=block_size; + }else{ + q->offset+=n; + q->queued-=n; + ret+=n; + break; + } + }else{ + if (unlikely(n<0)) + *flags|=F_BUFQ_ERROR_FLUSH; + break; + } + } + if (likely(q->first==0)){ + q->last=0; + q->last_used=0; + q->offset=0; + *flags|=F_BUFQ_EMPTY; + } + return ret; +} + + + + +#endif /*__sbufq_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */

13 years, 11 months

git:andrei/tcp_tls_changes: tls: safer destroy_cfg

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 258cc031138b572aa90b4478baed4bb9708b0a37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=258cc03… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 20 16:18:16 2010 +0200 tls: safer destroy_cfg - tls_destroy_cfg() can now be called safely more then once. --- modules/tls/tls_domain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index a106f4a..891a9c5 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -128,6 +128,7 @@ void tls_destroy_cfg(void) if (tls_cfg_lock) { lock_destroy(tls_cfg_lock); lock_dealloc(tls_cfg_lock); + tls_cfg_lock = 0; } if (tls_cfg) { @@ -138,6 +139,7 @@ void tls_destroy_cfg(void) } shm_free(tls_cfg); + tls_cfg = 0; } }

13 years, 11 months

git:andrei/tcp_tls_changes: tls: added custom memory based bio

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: d13629b64226ba665bf9ed2d8211189215bb5157 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d13629b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 25 20:30:57 2010 +0100 tls: added custom memory based bio Added a custom memory based BIO, that reads and writes in some memory buffers. It will be used to replace the direct socket access. --- modules/tls/tls_bio.c | 246 +++++++++++++++++++++++++++++++++++++++++++++++++ modules/tls/tls_bio.h | 54 +++++++++++ 2 files changed, 300 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_bio.c b/modules/tls/tls_bio.c new file mode 100644 index 0000000..a7ba50d --- /dev/null +++ b/modules/tls/tls_bio.c @@ -0,0 +1,246 @@ +/* + * $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. + */ +/** openssl BIOs for reading/writing via a fixed memory buffer. + * @file /home/andrei/sr.git/modules/tls/tls_bio.c + * @ingroup tls + * @Module: @ref tls + */ +/* + * History: + * -------- + * 2010-03-25 initial version (andrei) +*/ + +#include "tls_bio.h" +#include "../../compiler_opt.h" +#include "../../dprint.h" +#include "../../ut.h" + +/* 0xf2 should be unused (as of openssl 1.0.0 max. + internal defined BIO is 23) */ +#define BIO_TYPE_TLS_MBUF (BIO_TYPE_SOURCE_SINK | 0xf2) + + +static int tls_bio_mbuf_new(BIO* b); +static int tls_bio_mbuf_free(BIO* b); +static int tls_bio_mbuf_write(BIO* b, const char* buf, int num); +static int tls_bio_mbuf_read(BIO* b, char* buf, int num); +static int tls_bio_mbuf_puts(BIO* b, const char* s); +static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2); + + +static BIO_METHOD tls_mbuf_method = { + BIO_TYPE_TLS_MBUF, /* type */ + "sr_tls_mbuf", /* name */ + tls_bio_mbuf_write, /* write function */ + tls_bio_mbuf_read, /* read function */ + tls_bio_mbuf_puts, /* puts function */ + 0, /* gets function */ + tls_bio_mbuf_ctrl, /* ctrl function */ + tls_bio_mbuf_new, /* create(new) function */ + tls_bio_mbuf_free, /* destroy(free) function */ + 0 /* ctrl callback */ +}; + + +/** returns a custom tls_mbuf BIO. */ +BIO_METHOD* tls_BIO_mbuf(void) +{ + return &tls_mbuf_method; +} + + + +/** create an initialize a new tls_BIO_mbuf. + * @return new BIO on success (!=0), 0 on error. + */ +BIO* tls_BIO_new_mbuf(struct tls_mbuf* rd, struct tls_mbuf* wr) +{ + BIO* ret; + + ret = BIO_new(tls_BIO_mbuf()); + if (unlikely(ret == 0)) + return 0; + if (unlikely(tls_BIO_mbuf_set(ret, rd, wr) == 0)) { + BIO_free(ret); + return 0; + } + return ret; +} + + + +/** sets the read and write mbuf for an mbuf BIO. + * @return 1 on success, 0 on error (openssl BIO convention). + */ +int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr) +{ + struct tls_bio_mbuf_data* d; + + if (unlikely(b->ptr == 0)){ + BUG("null BIO ptr\n"); + return 0; + } + d = b->ptr; + d->rd = rd; + d->wr = wr; + b->init = 1; + return 1; +} + + + +/** create a new BIO. + * (internal openssl use via the tls_mbuf method) + * @return 1 on success, 0 on error. + */ +static int tls_bio_mbuf_new(BIO* b) +{ + struct tls_bio_mbuf_data* d; + + b->init = 0; /* not initialized yet */ + b->num = 0; + b->ptr = 0; + b->flags = 0; + d = OPENSSL_malloc(sizeof(*d)); + if (unlikely(d == 0)) + return 0; + d->rd = 0; + d->wr = 0; + b->ptr = d; + return 1; +} + + + +/** destroy a tls mbuf BIO. + * (internal openssl use via the tls_mbuf method) + * @return 1 on success, 0 on error. + */ +static int tls_bio_mbuf_free(BIO* b) +{ + if (unlikely( b == 0)) + return 0; + if (likely(b->ptr)){ + OPENSSL_free(b->ptr); + b->ptr = 0; + b->init = 0; + } + return 1; +} + + + +/** read from a mbuf. + * (internal openssl use via the tls_mbuf method) + * @return bytes read on success (0< ret <=dst_len), -1 on empty buffer & sets + * should_retry_read, -1 on some other errors (w/o should_retry_read set). + */ +static int tls_bio_mbuf_read(BIO* b, char* dst, int dst_len) +{ + struct tls_bio_mbuf_data* d; + struct tls_mbuf* rd; + int ret; + + ret = 0; + if (likely(dst)) { + d= b->ptr; + BIO_clear_retry_flags(b); + if (unlikely(d == 0 || d->rd->buf == 0)) { + if (d == 0) + BUG("tls_BIO_mbuf %p: read called with null b->ptr\n", b); + else + BUG("tls_BIO_mbuf %p: read called with null read buffer\n", b); + return -1; + } + rd = d->rd; + if (unlikely(rd->used == rd->pos && dst_len)) { + /* mimic non-blocking read behaviour */ + BIO_set_retry_read(b); + return -1; + } + ret = MIN_int(rd->used - rd->pos, dst_len); + /* copy data from rd.buf into dst */ + memcpy(rd->buf+rd->pos, dst, ret); + rd->pos += ret; +/* if (unlikely(rd->pos < rd->used)) + BIO_set_retry_read(b); +*/ + } + return ret; +} + + + +/** write to a mbuf. + * (internal openssl use via the tls_mbuf method) + * @return bytes written on success (0<= ret <=src_len), -1 on error or buffer + * full (in this case sets should_retry_write). + */ +static int tls_bio_mbuf_write(BIO* b, const char* src, int src_len) +{ + struct tls_bio_mbuf_data* d; + struct tls_mbuf* wr; + int ret; + + ret = 0; + d= b->ptr; + BIO_clear_retry_flags(b); + if (unlikely(d == 0 || d->wr->buf == 0)) { + if (d == 0) + BUG("tls_BIO_mbuf %p: write called with null b->ptr\n", b); + else + BUG("tls_BIO_mbuf %p: write called with null read buffer\n", b); + return -1; + } + wr = d->wr; + if (unlikely(wr->size == wr->used && src_len)) { + /* mimic non-blocking socket behaviour */ + BIO_set_retry_write(b); + return -1; + } + ret = MIN_int(wr->size - wr->used, src_len); + memcpy(wr->buf + wr->used, src, ret); + wr->used += ret; +/* if (unlikely(ret < src_len)) + BIO_set_retry_write(); +*/ + return ret; +} + + + +static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2) +{ + /* no cmd supported */ + return 0; +} + + + +static int tls_bio_mbuf_puts(BIO* b, const char* s) +{ + int len; + + len=strlen(s); + return tls_bio_mbuf_write(b, s, len); +} + + + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/modules/tls/tls_bio.h b/modules/tls/tls_bio.h new file mode 100644 index 0000000..78d5a47 --- /dev/null +++ b/modules/tls/tls_bio.h @@ -0,0 +1,54 @@ +/* + * $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. + */ +/** openssl BIOs for reading/writing via a fixed memory buffer. + * @file modules/tls/tls_bio.h + * @ingroup tls + * @Module: @ref tls + */ +/* + * History: + * -------- + * 2010-03-25 initial version (andrei) +*/ + +#ifndef __tls_bio_h +#define __tls_bio_h + +#include <openssl/bio.h> + +/* memory buffer used for tls I/O */ +struct tls_mbuf { + unsigned char* buf; + int pos; /* current position in the buffer while reading*/ + int used; /* how much it's used */ + int size; /* total buffer size (fixed) */ +}; + +struct tls_bio_mbuf_data { + struct tls_mbuf* rd; + struct tls_mbuf* wr; +}; + + +BIO_METHOD* tls_BIO_mbuf(void); +BIO* tls_BIO_new_mbuf(struct tls_mbuf* rd, struct tls_mbuf* wr); +int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr); + +#endif /*__tls_bio_h*/ + +/* vi: set ts=4 sw=4 tw=79:ai:cindent: */

13 years, 11 months

git:andrei/tcp_tls_changes: tcp: minor cleanups & spelling

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 7f1b8eb817b26c27d273433d4365d10defca6301 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f1b8eb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 25 20:29:32 2010 +0100 tcp: minor cleanups & spelling - removed F_CONN_NON_BLOCKING (not used anymore) - spelling & whitespace cleanups --- tcp_conn.h | 1 - tcp_main.c | 4 ++-- tcp_read.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tcp_conn.h b/tcp_conn.h index bedaf4d..3ce6084 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -61,7 +61,6 @@ /* tcp connection flags */ -#define F_CONN_NON_BLOCKING 1 #define F_CONN_READ_W 2 /* watched for READ ev. in main */ #define F_CONN_WRITE_W 4 /* watched for WRITE (main) */ #define F_CONN_READER 8 /* handled by a tcp reader */ diff --git a/tcp_main.c b/tcp_main.c index 1b26add..e539896 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -3750,9 +3750,9 @@ inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev, #ifdef TCP_ASYNC send_to_child: #endif - DBG("tcp: DBG: sendig to child, events %x\n", ev); + DBG("tcp: DBG: sending to child, events %x\n", ev); #ifdef POLLRDHUP - tcpconn->flags|=((int)!(ev & (POLLRDHUP|POLLHUP|POLLERR)) -1) & + tcpconn->flags|=((int)!(ev & (POLLRDHUP|POLLHUP|POLLERR)) -1) & F_CONN_EOF_SEEN; #else /* POLLRDHUP */ tcpconn->flags|=((int)!(ev & (POLLHUP|POLLERR)) -1) & F_CONN_EOF_SEEN; diff --git a/tcp_read.c b/tcp_read.c index c5fc575..2946554 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -928,7 +928,7 @@ again: } /* if we received the fd there is most likely data waiting to * be read => process it first to avoid extra sys calls */ - read_flags=((con->flags & (F_CONN_EOF_SEEN|F_CONN_FORCE_EOF)) && + read_flags=((con->flags & (F_CONN_EOF_SEEN|F_CONN_FORCE_EOF)) && !(con->flags & F_CONN_OOB_DATA))? RD_CONN_FORCE_EOF :0; resp=tcp_read_req(con, &n, &read_flags);

13 years, 11 months

git:andrei/tcp_tls_changes: tcp: new tls hooks interface and async tls changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: ce51fbb84e56921030b62d8617db2365ad934b51 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce51fbb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 20 16:00:29 2010 +0200 tcp: new tls hooks interface and async tls changes - new tls hooks interface that better accommodates tls async use. Changed read() (takes an extra flags parameter now), removed blocking_write() and fix_read_con(), added do_send() and fst_send() (both of them handle snd_flags now and might return a command that should be sent to tcp_main). - more tcp send functions (tcpconn_1st_send(), tcpconn_send_unsafe()) and more send functions exported (tls_int_send.h) for use from the tls module. - split tcp_read() into tcp_read() and tcp_read_data() and exported tcp_read_data() (tcp_read.h). - support for repeating a tcp_read() if indicated (RD_CONN_REPEAT_READ), needed for tls. --- tcp_int_send.h | 50 +++++ tcp_main.c | 651 ++++++++++++++++++++++++++++++++------------------------ tcp_read.c | 144 ++++++++----- tcp_read.h | 46 ++++ tls_hooks.h | 31 ++-- 5 files changed, 579 insertions(+), 343 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ce5…

13 years, 11 months

git:master: fix memset call, set the variable to zero, not to the size with length 0..

by Henning Westerholt

Module: sip-router Branch: master Commit: 355636358c07b8da9b1fcd6d04cdaf337c9f730c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3556363… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 20 15:46:58 2010 +0200 fix memset call, set the variable to zero, not to the size with length 0.. --- cfg/cfg_script.c | 2 +- modules_k/xcap_client/xcap_functions.c | 2 +- rvalue.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cfg/cfg_script.c b/cfg/cfg_script.c index 5f33ffd..a4ef236 100644 --- a/cfg/cfg_script.c +++ b/cfg/cfg_script.c @@ -107,7 +107,7 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type var = (cfg_script_var_t *)pkg_malloc(sizeof(cfg_script_var_t)); if (!var) goto error; - memset(var, sizeof(cfg_script_var_t), 0); + memset(var, 0, sizeof(cfg_script_var_t)); var->type = type; /* add the variable to the group */ diff --git a/modules_k/xcap_client/xcap_functions.c b/modules_k/xcap_client/xcap_functions.c index 1d3cea6..ba049e4 100644 --- a/modules_k/xcap_client/xcap_functions.c +++ b/modules_k/xcap_client/xcap_functions.c @@ -531,7 +531,7 @@ char* send_http_get(char* path, unsigned int xcap_port, char* match_etag, { char* hdr_name= NULL; - memset(buf, 128* sizeof(char), 0); + memset(buf, 0, 128* sizeof(char)); match_header= buf; hdr_name= (match_type==IF_MATCH)?"If-Match":"If-None-Match"; diff --git a/rvalue.c b/rvalue.c index d02b194..38a0eb7 100644 --- a/rvalue.c +++ b/rvalue.c @@ -2448,7 +2448,7 @@ struct rval_expr* mk_rval_expr_v(enum rval_type rv_type, void* val, rve=pkg_malloc(sizeof(*rve)); if (rve==0) return 0; - memset(rve, sizeof(*rve), 0); + memset(rve, 0, sizeof(*rve)); flags=0; switch(rv_type){ case RV_INT: @@ -2522,7 +2522,7 @@ struct rval_expr* mk_rval_expr1(enum rval_expr_op op, struct rval_expr* rve1, ret=pkg_malloc(sizeof(*ret)); if (ret==0) return 0; - memset(ret, sizeof(*ret), 0); + memset(ret, 0, sizeof(*ret)); ret->op=op; ret->left.rve=rve1; if (pos) ret->fpos=*pos; @@ -2575,7 +2575,7 @@ struct rval_expr* mk_rval_expr2(enum rval_expr_op op, struct rval_expr* rve1, ret=pkg_malloc(sizeof(*ret)); if (ret==0) return 0; - memset(ret, sizeof(*ret), 0); + memset(ret, 0, sizeof(*ret)); ret->op=op; ret->left.rve=rve1; ret->right.rve=rve2;

13 years, 11 months

git:master: Extended kamctl with new features built over sercmd:

by Marius Zbihlei

Module: sip-router Branch: master Commit: 833632a0eafcbbbcd7ce53937c4b4a21f99d9bec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=833632a… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu May 20 16:24:55 2010 +0300 Extended kamctl with new features built over sercmd: 1. Posibility to run sercmd commands via "kamctl ser" (no readline enhancements yet) 2. A new CTLENGINE ser_mi that besides unixsock and fifo provides access to mi commands. "CTLENGINE=ser_mi kamctl ser_mi debug 3" --- utils/kamctl/Makefile | 10 ++++ utils/kamctl/kamctl | 20 ++++++++- utils/kamctl/kamctl.ser | 60 +++++++++++++++++++++++++++ utils/kamctl/kamctl.ser_mi | 98 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 187 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 61bcee0..57677a0 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -48,6 +48,16 @@ install-bin: $(bin_prefix)/$(bin_dir) $(modules_prefix)/$(lib_dir)/kamctl/kamctl.fifo rm -fr /tmp/kamctl.fifo sed -e "s#/usr/local#$(bin_target)#g" \ + < kamctl.ser > /tmp/kamctl.ser + $(INSTALL_CFG) /tmp/kamctl.ser \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser + rm -fr /tmp/kamctl.ser + sed -e "s#/usr/local#$(bin_target)#g" \ + < kamctl.ser_mi > /tmp/kamctl.ser_mi + $(INSTALL_CFG) /tmp/kamctl.ser_mi \ + $(modules_prefix)/$(lib_dir)/kamctl/kamctl.ser_mi + rm -fr /tmp/kamctl.ser_mi + sed -e "s#/usr/local#$(bin_target)#g" \ < kamctl.unixsock > /tmp/kamctl.unixsock $(INSTALL_CFG) /tmp/kamctl.unixsock \ $(modules_prefix)/$(lib_dir)/kamctl/kamctl.unixsock diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index afb7a46..09a0fb8 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -127,8 +127,21 @@ case $CTLENGINE in CTLENGINELOADED=1 fi ;; + SER_MI|ser_mi) + if [ -f "$MYLIBDIR/kamctl.ser_mi" ]; then + . "$MYLIBDIR/kamctl.ser_mi" + CTLENGINELOADED=1 + fi + ;; esac +#### ------------------------------------------------- ##### +### Load sercm interface +# +if [ -f "$MYLIBDIR/kamctl.ser" ]; then + . "$MYLIBDIR/kamctl.ser" +fi + if [ $CTLENGINELOADED -eq 1 ] ; then mdbg "Control engine '$CTLENGINE' loaded" else @@ -2313,12 +2326,17 @@ case $1 in trusted "$@" ;; - fifo|unixsock) + fifo|unixsock|ser_mi) require_ctlengine shift $CTLCMD "$@" ;; + ser) + shift + $SERCTLCMD "$@" + ;; + lcr) shift lcr "$@" diff --git a/utils/kamctl/kamctl.ser b/utils/kamctl/kamctl.ser new file mode 100644 index 0000000..b70deed --- /dev/null +++ b/utils/kamctl/kamctl.ser @@ -0,0 +1,60 @@ +# +# $Id$ +# +# control tool for maintaining Kamailio +# +#=================================================================== + +##### ----------------------------------------------- ##### +### FIFO specific variables and functions +# + +##### ----------------------------------------------- ##### +### load CTL base +# +if [ -f "$MYLIBDIR/kamctl.ctlbase" ]; then + . "$MYLIBDIR/kamctl.ctlbase" +else + mwarn "Cannot load CTL core functions '$MYLIBDIR/kamctl.ctlbase' ..." + # exit -1 +fi + +# +##### ----------------------------------------------- ##### +### parameters +# +SERCMD=`which sercmd` +if [ -z "$SERCMD" ] ; then + SERCMD="/usr/local/sbin/sercmd" +fi + +# +##### ----------------------------------------------- ##### +### functions +# +usage_ser() { + echo + mecho " -- command 'ser'" + echo +cat <<EOF + ser ............................... send command thru sercmd +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser" + + +ser_cmd() +{ + mdbg "entering ser_mi_cmd $*" + + if [ "$#" -lt 1 ]; then + merr "ser_cmd must take at least command name as parameter" + exit 1 + fi + + + $SERCMD "$@" +} + +SERCTLCMD=ser_cmd + diff --git a/utils/kamctl/kamctl.ser_mi b/utils/kamctl/kamctl.ser_mi new file mode 100644 index 0000000..fdf247c --- /dev/null +++ b/utils/kamctl/kamctl.ser_mi @@ -0,0 +1,98 @@ +# +# $Id$ +# +# control tool for maintaining Kamailio +# +#=================================================================== + +##### ----------------------------------------------- ##### +### FIFO specific variables and functions +# + +##### ----------------------------------------------- ##### +### load CTL base +# +if [ -f "$MYLIBDIR/kamctl.ctlbase" ]; then + . "$MYLIBDIR/kamctl.ctlbase" +else + mwarn "Cannot load CTL core functions '$MYLIBDIR/kamctl.ctlbase' ..." + # exit -1 +fi + +# +##### ----------------------------------------------- ##### +### parameters +# +SERCMD=`which sercmd` +if [ -z "$SERCMD" ] ; then + SERCMD="/usr/local/sbin/sercmd" +fi + +# +##### ----------------------------------------------- ##### +### functions +# +usage_ser_mi() { + echo + mecho " -- command 'ser_mi'" + echo +cat <<EOF + ser ............................... send mi command thru sercmd +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser_mi" + + +ser_mi_cmd() +{ + mdbg "entering ser_mi_cmd $*" + + if [ "$#" -lt 1 ]; then + merr "ser_cmd must take at least command name as parameter" + exit 1 + fi + + + $SERCMD mi "$@" +} + +CTLCMD=ser_mi_cmd + +ser_mi_monitor() { + trap "rm $path; clear; echo monitor ^C-ed; exit 1" 2 + attempt=0 + if [ "$2" = "" ]; then + loops=-1; + else + loops=$2; + fi + clear + while [ $loops -ne $attempt ] ; do + attempt=`$EXPR $attempt + 1` + #clear + tput clear + + # print_stats $name $path $attempt + mecho "[cycle #: $attempt; if constant make sure server lives]" + + $SERCMD mi version + $SERCMD mi uptime + mecho "Transaction Statistics" + $SERCMD mi get_statistics UAS_transactions UAC_transactions inuse_transactions + + mecho "Stateless Server Statistics: " + $SERCMD mi get_statistics sent_replies sent_err_replies received_ACKs + + mecho "UsrLoc Stats: " + $SERCMD mi get_statistics usrloc + if [ $loops -ne $attempt ] ; then + sleep $WATCH_PERIOD + fi + done + exit 0 +} + +OPENSER_MONITOR=ser_mi_monitor + + +

13 years, 11 months

git:master: core: bit conting and testing functions

by Miklos Tirpak

Module: sip-router Branch: master Commit: 7ee950eb3e34dc0cdb3e825fa347dd29e7526afc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ee950e… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 19 11:53:19 2010 +0200 core: bit conting and testing functions new functions for bit operations: - bit_count() - bit_test() - bit_test_and_set() --- bit_count.c | 44 +++++++++++++++++++++ bit_count.h | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ bit_test.h | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 0 deletions(-) diff --git a/bit_count.c b/bit_count.c new file mode 100644 index 0000000..faef43c --- /dev/null +++ b/bit_count.c @@ -0,0 +1,44 @@ +/* + * $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. + * + * History + * ------- + * 2010-04-26 Initial version (Miklos) + */ + +#include "bit_count.h" + +#if 0 +/* number of bits in a byte */ +int bits_in_char[256] = { + 0 ,1 ,1 ,2 ,1 ,2 ,2 ,3 ,1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 , + 1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 ,2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 , + 1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 ,2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 ,2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 ,4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 , + 1 ,2 ,2 ,3 ,2 ,3 ,3 ,4 ,2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 ,4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 , + 2 ,3 ,3 ,4 ,3 ,4 ,4 ,5 ,3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 , + 3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 ,4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 , + 3 ,4 ,4 ,5 ,4 ,5 ,5 ,6 ,4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 , + 4 ,5 ,5 ,6 ,5 ,6 ,6 ,7 ,5 ,6 ,6 ,7 ,6 ,7 ,7 ,8 }; +#endif diff --git a/bit_count.h b/bit_count.h new file mode 100644 index 0000000..6e7f62c --- /dev/null +++ b/bit_count.h @@ -0,0 +1,101 @@ +/* + * $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. + * + * History + * ------- + * 2010-04-26 Initial version (Miklos) + */ + +/* Implements the bit counting function: + * int bit_count(unsigned int u) + * Returns the number of bits in u. + */ + +#ifndef _BIT_COUNT_H +#define _BIT_COUNT_H + +/* fix __CPU_i386 -> __CPU_x86 */ +#if defined __CPU_i386 && ! defined __CPU_x86 +#define __CPU_x86 +#endif + +#ifdef CC_GCC_LIKE_ASM +#if defined __CPU_x86 || defined __CPU_x86_64 +#ifdef __SSE4_2__ +/* popcnt requires SSE4.2 support, + * see http://en.wikipedia.org/wiki/SSE4 */ +#define BIT_COUNT_ASM +#endif +#endif +#endif + +#ifdef BIT_COUNT_ASM + +/* Returns the number of 1 bits in u. */ +static inline int bit_count(unsigned int u) +{ + int v; + + asm volatile(" popcnt %1, %0 " : "=r" (v) : "rm" (u)); + return v; +} + +#else /* BIT_COUNT_ASM */ + +/* Returns the number of 1 bits in u. + * source: http://en.wikipedia.org/wiki/Hamming_weight + */ +#if 0 +static inline int bit_count(unsigned int u) +{ + int count; + + /* It is likely to have only few + * bits set to 1, so there will be only + * few iterations */ + for (count=0; u; count++) + u &= u-1; + return count; +} +#endif + +static inline int bit_count(unsigned int i) +{ + i = i - ((i >> 1) & 0x55555555); + i = (i & 0x33333333) + ((i >> 2) & 0x33333333); + return (((i + (i >> 4)) & 0xF0F0F0F) * 0x1010101) >> 24; +} + +#if 0 +/* number of bits in a byte. + * (Only slightly faster then the above version, + * It is not worth the extra memory usage.) + */ +extern int bits_in_char[256]; + +static inline int bit_count(unsigned int u) +{ + return bits_in_char [u & 0xffu] + + bits_in_char [(u >> 8 ) & 0xffu] + + bits_in_char [(u >> 16) & 0xffu] + + bits_in_char [(u >> 24) & 0xffu]; +} +#endif + +#endif /* BIT_COUNT_ASM */ + +#endif /* _BIT_COUNT_H */ diff --git a/bit_test.h b/bit_test.h new file mode 100644 index 0000000..534e502 --- /dev/null +++ b/bit_test.h @@ -0,0 +1,121 @@ +/* + * $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. + * + * History + * ------- + * 2010-04-26 Initial version (Miklos) + */ + +/* Bit test functions: + * - int bit_test(int offset, unsigned int *addr) + * Returns the bit found at offset position + * in a bitstring pointed by addr. + * + * - int bit_test_and_set(int offset, unsigned int *addr) + * Returns the bit found at offset position + * in a bitstring pointed by addr, and sets + * the bit at the given offset. + * + * Note that 0 <= offset <= 128, Make sure that addr points to + * a large enough memory area. + */ + +#ifndef _BIT_TEST_H +#define _BIT_TEST_H + +/* fix __CPU_i386 -> __CPU_x86 */ +#if defined __CPU_i386 && ! defined __CPU_x86 +#define __CPU_x86 +#endif + +#ifdef CC_GCC_LIKE_ASM +#if defined __CPU_x86 || defined __CPU_x86_64 +#define BIT_TEST_ASM +#endif +#endif + +#ifdef BIT_TEST_ASM + +/* Returns the bit found at offset position in the bitstring + * pointed by addr. + * Note that the CPU can access 4 bytes starting from addr, + * hence 0 <= offset < 128 holds. Make sure that addr points + * to a memory area that is large enough. + */ +static inline int bit_test(int offset, unsigned int *addr) +{ + unsigned char v; + + asm volatile( + " bt %2, %1 \n\t" + " setc %0 \n\t" + : "=qm" (v) : "m" (*addr), "r" (offset) + ); + return (int)v; +} + +/* Returns the bit found at offset position in the bitstring + * pointed by addr and sets it to 1. + * Note that the CPU can access 4 bytes starting from addr, + * hence 0 <= offset < 128 holds. Make sure that addr points + * to a memory area that is large enough. + */ +static inline int bit_test_and_set(int offset, unsigned int *addr) +{ + unsigned char v; + + asm volatile( + " bts %2, %1 \n\t" + " setc %0 \n\t" + : "=qm" (v) : "m" (*addr), "r" (offset) + ); + return (int)v; +} + +#else /* BIT_TEST_ASM */ + +/* Returns the bit found at offset position in the bitstring + * pointed by addr. + * Note that offset can be grater than 32, make sure that addr points + * to a memory area that is large enough. + */ +static inline int bit_test(int offset, unsigned int *addr) +{ + return ((*(addr + offset/32)) & (1U << (offset % 32))) ? 1 : 0; +} + +/* Returns the bit found at offset position in the bitstring + * pointed by addr and sets it to 1. + * Note that offset can be grater than 32, make sure that addr points + * to a memory area that is large enough. + */ +static inline int bit_test_and_set(int offset, unsigned int *addr) +{ + unsigned int *i; + int mask, res; + + i = addr + offset/32; + mask = 1U << (offset % 32); + res = ((*i) & mask) ? 1 : 0; + (*i) |= mask; + + return res; +} + +#endif /* BIT_TEST_ASM */ + +#endif /* #ifndef _BIT_TEST_H */

13 years, 12 months

← Newer
1
...
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2010