sr-dev

sr-dev@lists.kamailio.org

8 participants
44164 discussions

git:ser_core_cvs: avp: warning fixes & more sane usr_avp struct

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: fdb745814609b8ed58f15a48a5379f7944b1323e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fdb7458… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 28 15:24:01 2008 +0000 avp: warning fixes & more sane usr_avp struct - type punning warning fixed (both for =-Wstrict-aliasing and -Wstrict-aliasing=2) - replaced usr_avp->data with a union (more sane, looks better) --- usr_avp.c | 33 +++++++++++++-------------------- usr_avp.h | 10 ++++++++-- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index e70479c..6d766e2 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -154,7 +154,6 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_int_data *sid; struct str_str_data *ssd; int len; - void** p_data; if (name.s.s == 0 && name.s.len == 0) { LOG(L_ERR,"ERROR:avp:add_avp: 0 ID or NULL NAME AVP!"); @@ -169,15 +168,15 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) goto error; } if (flags&AVP_VAL_STR) { - len += sizeof(struct str_str_data)-sizeof(void*) + len += sizeof(struct str_str_data)-sizeof(union usr_avp_data) + name.s.len + 1 /* Terminating zero for regex search */ + val.s.len + 1; /* Value is zero terminated */ } else { - len += sizeof(struct str_int_data)-sizeof(void*) + len += sizeof(struct str_int_data)-sizeof(union usr_avp_data) + name.s.len + 1; /* Terminating zero for regex search */ } } else if (flags&AVP_VAL_STR) { - len += sizeof(str)-sizeof(void*) + val.s.len + 1; + len += sizeof(str)-sizeof(union usr_avp_data) + val.s.len + 1; } avp = (struct usr_avp*)shm_malloc( len ); @@ -189,17 +188,16 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) avp->flags = flags; avp->id = (flags&AVP_NAME_STR)? compute_ID(&name.s) : name.n ; avp->next = NULL; - p_data=&avp->data; /* strict aliasing /type punning warnings workarround */ switch ( flags&(AVP_NAME_STR|AVP_VAL_STR) ) { case 0: /* avp type ID, int value */ - avp->data = (void*)(long)val.n; + avp->d.l = val.n; break; case AVP_NAME_STR: /* avp type str, int value */ - sid = (struct str_int_data*)p_data; + sid = (struct str_int_data*)&avp->d.data[0]; sid->val = val.n; sid->name.len =name.s.len; sid->name.s = (char*)sid + sizeof(struct str_int_data); @@ -208,7 +206,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) break; case AVP_VAL_STR: /* avp type ID, str value */ - s = (str*)p_data; + s = (str*)&avp->d.data[0]; s->len = val.s.len; s->s = (char*)s + sizeof(str); memcpy( s->s, val.s.s , s->len); @@ -216,7 +214,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) break; case AVP_NAME_STR|AVP_VAL_STR: /* avp type str, str value */ - ssd = (struct str_str_data*)p_data; + ssd = (struct str_str_data*)&avp->d.data[0]; ssd->name.len = name.s.len; ssd->name.s = (char*)ssd + sizeof(struct str_str_data); memcpy( ssd->name.s , name.s.s, name.s.len); @@ -298,7 +296,6 @@ int add_avp_before(avp_t *avp, avp_flags_t flags, avp_name_t name, avp_value_t v /* get value functions */ inline str* get_avp_name(avp_t *avp) { - void** p_data; /* strict aliasing /type punning warnings workarround */ switch ( avp->flags&(AVP_NAME_STR|AVP_VAL_STR) ) { @@ -309,12 +306,10 @@ inline str* get_avp_name(avp_t *avp) return 0; case AVP_NAME_STR: /* avp type str, int value */ - p_data=&avp->data; - return &((struct str_int_data*)p_data)->name; + return &((struct str_int_data*)&avp->d.data[0])->name; case AVP_NAME_STR|AVP_VAL_STR: /* avp type str, str value */ - p_data=&avp->data; - return &((struct str_str_data*)p_data)->name; + return &((struct str_str_data*)&avp->d.data[0])->name; } LOG(L_ERR,"BUG:avp:get_avp_name: unknown avp type (name&val) %d\n", @@ -325,28 +320,26 @@ inline str* get_avp_name(avp_t *avp) inline void get_avp_val(avp_t *avp, avp_value_t *val) { - void** p_data; /* strict aliasing /type punning warnings workarround */ if (avp==0 || val==0) return; - p_data=&avp->data; switch ( avp->flags&(AVP_NAME_STR|AVP_VAL_STR) ) { case 0: /* avp type ID, int value */ - val->n = (long)(avp->data); + val->n = avp->d.l; break; case AVP_NAME_STR: /* avp type str, int value */ - val->n = ((struct str_int_data*)p_data)->val; + val->n = ((struct str_int_data*)&avp->d.data[0])->val; break; case AVP_VAL_STR: /* avp type ID, str value */ - val->s = *(str*)(void*)(&avp->data); + val->s = *(str*)&avp->d.data[0]; break; case AVP_NAME_STR|AVP_VAL_STR: /* avp type str, str value */ - val->s = (((struct str_str_data*)p_data)->val); + val->s = ((struct str_str_data*)&avp->d.data[0])->val; break; } } diff --git a/usr_avp.h b/usr_avp.h index 2b68107..aad0852 100644 --- a/usr_avp.h +++ b/usr_avp.h @@ -89,12 +89,18 @@ typedef union { #define avp_value_t int_str #define avp_index_t unsigned short +union usr_avp_data{ + void *p; /* forces alignment */ + long l; + char data[sizeof(void*)]; /* used to access other types, var length */ +}; + typedef struct usr_avp { avp_id_t id; - /* Flags that are kept for the AVP lifetime */ + /* Flags that are kept for the AVP lifetime */ avp_flags_t flags; struct usr_avp *next; - void *data; + union usr_avp_data d; /* var length */ } avp_t; typedef avp_t* avp_list_t;

16 years

git:ser_core_cvs: more type punning warnings fixed

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 018226b08a8ec20c79d324bc4c398bff9a87728a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=018226b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 28 15:24:15 2008 +0000 more type punning warnings fixed --- io_wait.h | 8 ++++++-- ip_addr.c | 2 +- ip_addr.h | 2 +- modules/tm/t_cancel.c | 10 +++++++--- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/io_wait.h b/io_wait.h index 9e047f4..148aa34 100644 --- a/io_wait.h +++ b/io_wait.h @@ -1142,6 +1142,9 @@ inline static int io_wait_loop_sigio_rt(io_wait_h* h, int t) int sigio_fd; struct fd_map* fm; int revents; +#ifdef SIGINFO64_WORKARROUND + int* pi; +#endif ret=1; /* 1 event per call normally */ @@ -1177,8 +1180,9 @@ again: * On newer kernels this is fixed (si_band is long in the kernel too). * -- andrei */ if ((_os_ver<0x020605) && (sizeof(siginfo.si_band)>sizeof(int))){ - sigio_band=*((int*)(void*)&siginfo.si_band); - sigio_fd=*(((int*)(void*)&siginfo.si_band)+1); + pi=(int*)(void*)&siginfo.si_band; /* avoid type punning warnings */ + sigio_band=*pi; + sigio_fd=*(pi+1); }else #endif { diff --git a/ip_addr.c b/ip_addr.c index 7f73775..e17a69d 100644 --- a/ip_addr.c +++ b/ip_addr.c @@ -190,7 +190,7 @@ int is_mcast(struct ip_addr* ip) return IN_MULTICAST(htonl(ip->u.addr32[0])); #ifdef USE_IPV6 } else if (ip->af==AF_INET6){ - return IN6_IS_ADDR_MULTICAST((struct in6_addr *)&ip->u.addr); + return IN6_IS_ADDR_MULTICAST(&ip->u.addr32[0]); #endif /* USE_IPV6 */ } else { LOG(L_ERR, "ERROR: is_mcast: Unsupported protocol family\n"); diff --git a/ip_addr.h b/ip_addr.h index 11d9f8c..6849a87 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -242,7 +242,7 @@ inline static int ip_addr_loopback(struct ip_addr* ip) return ip->u.addr32[0]==htonl(INADDR_LOOPBACK); #ifdef USE_IPV6 else if (ip->af==AF_INET6) - return IN6_IS_ADDR_LOOPBACK((struct in6_addr *)&ip->u.addr32); + return IN6_IS_ADDR_LOOPBACK(&ip->u.addr32[0]); #endif /* USE_IPV6 */ return 0; } diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index 96e4a84..4856abe 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -194,6 +194,7 @@ int cancel_branch( struct cell *t, int branch, int flags ) struct retr_buf *crb, *irb; int ret; branch_bm_t tmp_bm; + void* pcbuf; crb=&t->uac[branch].local_cancel; irb=&t->uac[branch].request; @@ -216,7 +217,8 @@ int cancel_branch( struct cell *t, int branch, int flags ) DBG("DEBUG: cancel_branch: no response ever received: " "giving up on cancel\n"); /* remove BUSY_BUFFER -- mark cancel buffer as not used */ - atomic_set_long((void*)&crb->buffer, 0); + pcbuf=&crb->buffer; /* workaround for type punning warnings */ + atomic_set_long(pcbuf, 0); if (flags & F_CANCEL_B_FAKE_REPLY){ LOCK_REPLIES(t); if (relay_reply(t, FAKED_REPLY, branch, 487, &tmp_bm, 1) == @@ -235,7 +237,8 @@ int cancel_branch( struct cell *t, int branch, int flags ) if (!(flags & F_CANCEL_B_FORCE_RETR)) stop_rb_retr(irb); /* stop retransmissions */ /* remove BUSY_BUFFER -- mark cancel buffer as not used */ - atomic_set_long((void*)&crb->buffer, 0); + pcbuf=&crb->buffer; /* workaround for type punning warnings */ + atomic_set_long(pcbuf, 0); if (flags & F_CANCEL_B_FAKE_REPLY){ stop_rb_timers( irb ); /* stop even the fr timer */ LOCK_REPLIES(t); @@ -262,7 +265,8 @@ int cancel_branch( struct cell *t, int branch, int flags ) if (!cancel) { LOG(L_ERR, "ERROR: attempt to build a CANCEL failed\n"); /* remove BUSY_BUFFER -- mark cancel buffer as not used */ - atomic_set_long((void*)&crb->buffer, 0); + pcbuf=&crb->buffer; /* workaround for type punning warnings */ + atomic_set_long(pcbuf, 0); return -1; } /* install cancel now */

16 years

git:ser_core_cvs: Fix warnings on LP64 plarforms out there ( all 64-bit amd64/emt64 unixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 8bed2c0e634a97254cd28a931e3e39771780dc17 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bed2c0… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Mon Dec 8 06:11:39 2008 +0000 Fix warnings on LP64 plarforms out there (all 64-bit amd64/emt64 unixes and linuxes) where sizeof(*void) != sizeof(int). --- io_wait.h | 2 +- lib/binrpc/binrpc_api.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/io_wait.h b/io_wait.h index 148aa34..0557c00 100644 --- a/io_wait.h +++ b/io_wait.h @@ -1104,7 +1104,7 @@ again: adding something to the changes array, close() and applying the changes */ LOG(L_INFO, "INFO: io_wait_loop_kqueue: kevent error on " - "fd %d: %s [%ld]\n", h->kq_array[r].ident, + "fd %ld: %s [%ld]\n", h->kq_array[r].ident, strerror(h->kq_array[r].data), (long)h->kq_array[r].data); }else{ diff --git a/lib/binrpc/binrpc_api.c b/lib/binrpc/binrpc_api.c index e843238..faf82d1 100644 --- a/lib/binrpc/binrpc_api.c +++ b/lib/binrpc/binrpc_api.c @@ -500,7 +500,7 @@ static int get_reply(struct binrpc_handle *handle, /* we must read all datagram in one read call, otherwise unread part is truncated and lost. Read will block execution */ if (crt - hdr_end < tl) { snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, - "get_reply: datagram truncated. Received: %d, Expected: %d.", + "get_reply: datagram truncated. Received: %ld, Expected: %d.", crt-hdr_end, tl); return FATAL_ERROR; }

16 years

git:ser_core_cvs: added new module prefix_route

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 6a7471a60ad923bf20f9941377fa637576fd47f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a7471a… Author: Alfred E. Heggestad <aeh(a)db.org> Committer: Alfred E. Heggestad <aeh(a)db.org> Date: Sat Dec 6 22:09:13 2008 +0000 added new module prefix_route --- pkg/rpm/ser.spec-4.1 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pkg/rpm/ser.spec-4.1 b/pkg/rpm/ser.spec-4.1 index 83e26a8..c9be028 100644 --- a/pkg/rpm/ser.spec-4.1 +++ b/pkg/rpm/ser.spec-4.1 @@ -216,6 +216,7 @@ fi %{_libdir}/ser/modules/pdt.so %{_libdir}/ser/modules/permissions.so %{_libdir}/ser/modules/pike.so +%{_libdir}/ser/modules/prefix_route.so %{_libdir}/ser/modules/print.so %{_libdir}/ser/modules/ratelimit.so %{_libdir}/ser/modules/registrar.so

16 years

git:ser_core_cvs: Use explicit comparison with NULL, it' s more clear and shuts off gcc,

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 2577e2f300c64e5ef88b10ec0941906dee7e0af5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2577e2f… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Mon Dec 8 06:16:52 2008 +0000 Use explicit comparison with NULL, it's more clear and shuts off gcc, which otherwise compain that condition is always true when argument is pointer to the struct allocated on stack. --- lib/cds/sstr.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cds/sstr.h b/lib/cds/sstr.h index 7dc331e..64b96b4 100644 --- a/lib/cds/sstr.h +++ b/lib/cds/sstr.h @@ -77,7 +77,7 @@ char *zt_strdup(const char*src); /** frees string content if allocated */ /* void str_free_content(str_t *s); */ -#define str_free_content(str) do { if (str) { \ +#define str_free_content(str) do { if (str != NULL) { \ if (((str)->len > 0) && ((str)->s)) cds_free((str)->s);\ (str)->len = 0; \ (str)->s = 0; \ @@ -85,13 +85,13 @@ char *zt_strdup(const char*src); /** frees string content if allocated and then the string itself */ /* void str_free(str_t *s); */ -#define str_free(str) do { if (str) { \ +#define str_free(str) do { if (str != NULL) { \ if (((str)->len > 0) && ((str)->s)) cds_free((str)->s);\ cds_free(str); \ } } while (0) /* clears string content */ -#define str_clear(str) do { if (str) { \ +#define str_clear(str) do { if (str != NULL) { \ (str)->len = 0; \ (str)->s = 0; \ } } while (0)

16 years

git:ser_core_cvs: clean up whitespace in makefile

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: befa138d0972ba56f05efb3045dd83e95e12ee03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=befa138… Author: Alfred E. Heggestad <aeh(a)db.org> Committer: Alfred E. Heggestad <aeh(a)db.org> Date: Mon Dec 8 12:26:39 2008 +0000 clean up whitespace in makefile --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 676d8c4..b0f5c88 100644 --- a/Makefile +++ b/Makefile @@ -577,7 +577,7 @@ $(man_prefix)/$(man_dir)/man7: $(man_prefix)/$(man_dir)/man5: mkdir -p $(man_prefix)/$(man_dir)/man5 - + # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) install-cfg: $(cfg_prefix)/$(cfg_dir) sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \ @@ -600,7 +600,7 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) # radius dictionary $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.ser $(INSTALL_CFG) etc/dictionary.ser $(cfg_prefix)/$(cfg_dir) - + # TLS configuration $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg $(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir)

16 years

git:ser_core_cvs: added README.prefix_route

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: f78f8c9af88b8b29a1304fe62f686c6929642cfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f78f8c9… Author: Alfred E. Heggestad <aeh(a)db.org> Committer: Alfred E. Heggestad <aeh(a)db.org> Date: Mon Dec 8 10:36:46 2008 +0000 added README.prefix_route --- pkg/rpm/ser.spec-4.1 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pkg/rpm/ser.spec-4.1 b/pkg/rpm/ser.spec-4.1 index c9be028..9f2682d 100644 --- a/pkg/rpm/ser.spec-4.1 +++ b/pkg/rpm/ser.spec-4.1 @@ -160,6 +160,7 @@ fi %doc %{_docdir}/ser/README.pdt %doc %{_docdir}/ser/README.permissions %doc %{_docdir}/ser/README.pike +%doc %{_docdir}/ser/README.prefix_route %doc %{_docdir}/ser/README.print %doc %{_docdir}/ser/README.ratelimit %doc %{_docdir}/ser/README.registrar

16 years

git:ser_core_cvs: update RPM spec file

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: c30d78cac2aa90f706c0c61f8551795cb877693c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c30d78c… Author: Alfred E. Heggestad <aeh(a)db.org> Committer: Alfred E. Heggestad <aeh(a)db.org> Date: Sat Dec 6 21:49:27 2008 +0000 update RPM spec file --- pkg/rpm/ser.spec-4.1 | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/pkg/rpm/ser.spec-4.1 b/pkg/rpm/ser.spec-4.1 index 833afcd..83e26a8 100644 --- a/pkg/rpm/ser.spec-4.1 +++ b/pkg/rpm/ser.spec-4.1 @@ -1,8 +1,8 @@ %define name ser %define ver 2.1.0 -%define rel 1 +%define rel dev23b -%define EXCLUDED_MODULES mysql jabber auth_radius group_radius uri_radius postgres snmp cpl cpl-c extcmd +%define EXCLUDED_MODULES mysql jabber auth_radius group_radius uri_radius postgres snmp cpl cpl-c extcmd ldap %define MYSQL_MODULES mysql %define JABBER_MODULES jabber %define RADIUS_MODULES auth_radius group_radius uri_radius @@ -69,7 +69,7 @@ The ser-jabber package contains a sip to jabber message translator. %setup -n %{name}-%{ver}-%{rel} %build -make all skip_modules="%EXCLUDED_MODULES" cfg-target=/%{_sysconfdir}/ser/ +make all include_modules="tls" skip_modules="%EXCLUDED_MODULES" cfg-target=/%{_sysconfdir}/ser/ make modules modules="modules/%MYSQL_MODULES" cfg-target=/%{_sysconfdir}/ser/ make modules modules="modules/%JABBER_MODULES" cfg-target=/%{_sysconfdir}/ser/ make modules modules="%RADIUS_MOD_PATH" cfg-target=/%{_sysconfdir}/ser/ @@ -78,7 +78,7 @@ make modules modules="%RADIUS_MOD_PATH" cfg-target=/%{_sysconfdir}/ser/ %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" -make install skip_modules="%EXCLUDED_MODULES" \ +make install include_modules="tls" skip_modules="%EXCLUDED_MODULES" \ basedir=$RPM_BUILD_ROOT \ prefix=/usr \ cfg-prefix=$RPM_BUILD_ROOT \ @@ -137,18 +137,21 @@ fi %doc %{_docdir}/ser/INSTALL %doc %{_docdir}/ser/README %doc %{_docdir}/ser/README-MODULES +%doc %{_docdir}/ser/README.acc_syslog %doc %{_docdir}/ser/README.auth %doc %{_docdir}/ser/README.auth_db %doc %{_docdir}/ser/README.avp %doc %{_docdir}/ser/README.avp_db -%doc %{_docdir}/ser/README.avpops -%doc %{_docdir}/ser/README.dbtext +%doc %{_docdir}/ser/README.cfg_db %doc %{_docdir}/ser/README.db_ops %doc %{_docdir}/ser/README.dispatcher %doc %{_docdir}/ser/README.diversion %doc %{_docdir}/ser/README.domain %doc %{_docdir}/ser/README.enum +%doc %{_docdir}/ser/README.eval %doc %{_docdir}/ser/README.exec +%doc %{_docdir}/ser/README.flatstore +%doc %{_docdir}/ser/README.gflags %doc %{_docdir}/ser/README.lcr %doc %{_docdir}/ser/README.maxfwd %doc %{_docdir}/ser/README.msilo @@ -161,11 +164,13 @@ fi %doc %{_docdir}/ser/README.ratelimit %doc %{_docdir}/ser/README.registrar %doc %{_docdir}/ser/README.rr +%doc %{_docdir}/ser/README.sanity %doc %{_docdir}/ser/README.sl %doc %{_docdir}/ser/README.sms %doc %{_docdir}/ser/README.speeddial %doc %{_docdir}/ser/README.textops %doc %{_docdir}/ser/README.timer +%doc %{_docdir}/ser/README.tls %doc %{_docdir}/ser/README.tm %doc %{_docdir}/ser/README.uac %doc %{_docdir}/ser/README.uri @@ -178,21 +183,26 @@ fi %config %{_sysconfdir}/rc.d/init.d/* %dir %{_libdir}/ser +%{_libdir}/ser/libser_cds.so +%{_libdir}/ser/libser_cds.so.0 +%{_libdir}/ser/libser_cds.so.0.1 %dir %{_libdir}/ser/modules %{_libdir}/ser/modules/acc_db.so %{_libdir}/ser/modules/acc_syslog.so %{_libdir}/ser/modules/auth.so %{_libdir}/ser/modules/auth_db.so %{_libdir}/ser/modules/avp.so -%{_libdir}/ser/modules/avpops.so %{_libdir}/ser/modules/avp_db.so +%{_libdir}/ser/modules/blst.so +%{_libdir}/ser/modules/cfg_db.so +%{_libdir}/ser/modules/cfg_rpc.so %{_libdir}/ser/modules/ctl.so %{_libdir}/ser/modules/db_ops.so -%{_libdir}/ser/modules/dbtext.so %{_libdir}/ser/modules/dispatcher.so %{_libdir}/ser/modules/diversion.so %{_libdir}/ser/modules/domain.so %{_libdir}/ser/modules/enum.so +%{_libdir}/ser/modules/eval.so %{_libdir}/ser/modules/exec.so %{_libdir}/ser/modules/fifo.so %{_libdir}/ser/modules/flatstore.so @@ -216,6 +226,7 @@ fi %{_libdir}/ser/modules/speeddial.so %{_libdir}/ser/modules/textops.so %{_libdir}/ser/modules/timer.so +%{_libdir}/ser/modules/tls.so %{_libdir}/ser/modules/tm.so %{_libdir}/ser/modules/uac.so %{_libdir}/ser/modules/uri.so @@ -237,6 +248,7 @@ fi %{_libdir}/ser/modules/mysql.so %{_sbindir}/ser_mysql.sh +/usr/share/ser/*.sql %files jabber %defattr(-,root,root)

16 years

git:ser_core_cvs: sctp protocol decoded in RPC dst_blacklist.view

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 1acade4541c8665f11800677f0ffe9ebf8608194 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1acade4… Author: Michal Matyska <michal.matyska(a)iptel.org> Committer: Michal Matyska <michal.matyska(a)iptel.org> Date: Tue Dec 9 14:09:22 2008 +0000 sctp protocol decoded in RPC dst_blacklist.view so it does not show unknown protocol anymore --- dst_blacklist.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dst_blacklist.c b/dst_blacklist.c index 3464517..bb6e35e 100644 --- a/dst_blacklist.c +++ b/dst_blacklist.c @@ -879,6 +879,8 @@ static char* get_proto_name(unsigned char proto) return "tcp"; case PROTO_TLS: return "tls"; + case PROTO_SCTP: + return "sctp"; default: return "unknown"; }

16 years

git:ser_core_cvs: another switch where PROTO_SCTP was missing - added case

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: e4c9fe9a983a8825a342ed085565a9fc15abeeea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4c9fe9… Author: Michal Matyska <michal.matyska(a)iptel.org> Committer: Michal Matyska <michal.matyska(a)iptel.org> Date: Thu Dec 11 19:12:41 2008 +0000 another switch where PROTO_SCTP was missing - added case --- dns_cache.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 14598e0..9a53fe4 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -3014,6 +3014,12 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name, tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0'; len=SRV_TLS_PREFIX_LEN + name->len; break; + case PROTO_SCTP: + memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN); + memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len); + tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0'; + len=SRV_SCTP_PREFIX_LEN + name->len; + break; default: LOG(L_CRIT, "BUG: sip_resolvehost: " "unknown proto %d\n", (int)srv_proto);

16 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev