Re: PostgresSQL DLR support
On Tuesday 03 February 2004 16:50, Stipe Tolj wrote: > Alexander Malysh wrote: > > hmm, that was my first attempt to get things right ;) > > Oracle's OCI is just complex and I've introduced 'select/update' within > > dbpool. IMO, we should abstract more, so that dbpool deal with > > DBConnection and DBConnection object should implement 'select/update'. > > +1 on a full dbpool abstraction layer. There are projects that try to > do this. Martin, if you can have a view into those?! It would be good to have a full dbpool abstraction layer. I'd like a pointer to some of the projects that do this, so I can have a look at them. There seems to be nothing database related at: http://kannel.org/roadmap.shtml#projects - Martin - -- "If we don't succeed, we run the risk of failure." --Bill Clinton, President
RE: Things I learned about MMS clients (so far)
> The final mystery is solved. My MMS client works with > Vodafone D2 in Germany. It turned out, that the WAP gateway > did not know about the binary encoding for > "application/vnd.wap.mms-message". > This is an WSP version issue, right ? Binary encoding for application/vnd.wap.mms-message is only specified for WSP 1.4 and higher. So if your WAP gateway indicates that it supports WSP 1.3 or lower, then its correct to reject the WSP PDU. Did you have to make your client WSP version aware ?
Test [IGNORE]
Please ignore this message. - Martin - -- "If we don't succeed, we run the risk of failure." --Bill Clinton, President
Re: Things I learned about MMS clients (so far)
> -Ursprüngliche Nachricht- > Von: Paul Keogh [mailto:[EMAIL PROTECTED] > Gesendet: Mittwoch, 4. Februar 2004 11:19 > An: 'Kannel-Devel (E-Mail)' > Betreff: RE: Things I learned about MMS clients (so far) > > This is an WSP version issue, right ? Binary encoding for > application/vnd.wap.mms-message is only specified for WSP 1.4 and > higher. > So if your WAP gateway indicates that it supports WSP 1.3 or lower, then > its correct to reject the WSP PDU. Did you have to make your client > WSP version aware ? Yes, this is a WSP version issue. It became obvious after I compared traces from a T610 with the traces of my client. And no, the client is not really WSP version aware. I'm just unconditionally sending the string representation of the content type. That's not perfect, but works for now. Regards Joerg
WSP Capabilities: What exactly is SDU size and what is Message si ze
Hi all, WSP spezifies two size capabilities: the SDU size and the Message size. Unfortunately I could not find an exact definition of what these sizes are actually refering to. My problem: As you know by now I'm working on a MMS client. To announce that I'm going to send a huge payload (e.g. a picture) I send a server-sdu-size of 128000 to the server. The Vodafone Gateway answers with a server-sdu-size of 32200. Despite of this claimed limitation I'm able to send messages of up to 100K. I'm puzzled by this. Can anybody shed some light on this issue? Thanks in advance Joerg
Re: PostgresSQL DLR support
Martin Atukunda wrote: > I'd like a pointer to some of the projects that do this, so I can have a look > at them. There seems to be nothing database related at: > > http://kannel.org/roadmap.shtml#projects that roadmap is outdated totally. @Alex: we have to add things from our roadmap proposal here. I'll try to scratch things up this week. At least I got one good reference for the abstraction layer for DBs, which is the libdbi Project, see http://libdbi-drivers.sourceforge.net/ Stipe mailto:[EMAIL PROTECTED] --- Wapme Systems AG Münsterstr. 248 40470 Düsseldorf, NRW, Germany phone: +49.211.74845.0 fax: +49.211.74845.299 mailto:[EMAIL PROTECTED] http://www.wapme-systems.de/ --- -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v1.2.2 (Cygwin) mIsEP6mcYwEEAMDnUiUwrbb+xwTFWN6TxF2+XZu7/alwJMeCwMBRvXtPZqfjpPhS OkBpU0F4TrVuugz1HINTSaJTYq10AzDQXp5NkyWgckqW79nPAWuOX0dicbJk+cN2 nM2TI4KaxUDe6u8hghNEnH/i2lXsUu9apnP/iixzV81VC2je3uc9hZpnAAYptEVT dGlwZSBUb2xqIChUZWNobm9sb2d5IENlbnRlciAmIFJlc2VhcmNoIExhYikgPHRv bGpAd2FwbWUtc3lzdGVtcy5kZT6ItAQTAQIAHgUCP6mcYwIbAwYLCQgHAwIDFQID AxYCAQIeAQIXgAAKCRABV0w1BqPYRuSqA/wPzsQxao2YePENCtgRTrO86U6zg3sl OcS6CJFI4FZP5h/xD3GRsNH1+MPSvZlomDdpFnr547DGz/Kq9MXuQwVvlVig5yWZ K5dtKp1r5YLhxJQBhfirZbRFFnYmf19f18J8OoS28tuFVftDl1AIwJS3HLyBTv6H g2HyLAEKQIp30Q== =aYCI -END PGP PUBLIC KEY BLOCK-
Re: [PATCH-RFC] adding pids to logging
Nisan Bloch wrote: > > At 01:12 PM 2004/01/28, Stipe Tolj wrote: > > >patch _has_ been commited to cvs. Please update and check. > > Looks good - works in test environ. runs even on our production env ;) Stipe mailto:[EMAIL PROTECTED] --- Wapme Systems AG Münsterstr. 248 40470 Düsseldorf, NRW, Germany phone: +49.211.74845.0 fax: +49.211.74845.299 mailto:[EMAIL PROTECTED] http://www.wapme-systems.de/ --- -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v1.2.2 (Cygwin) mIsEP6mcYwEEAMDnUiUwrbb+xwTFWN6TxF2+XZu7/alwJMeCwMBRvXtPZqfjpPhS OkBpU0F4TrVuugz1HINTSaJTYq10AzDQXp5NkyWgckqW79nPAWuOX0dicbJk+cN2 nM2TI4KaxUDe6u8hghNEnH/i2lXsUu9apnP/iixzV81VC2je3uc9hZpnAAYptEVT dGlwZSBUb2xqIChUZWNobm9sb2d5IENlbnRlciAmIFJlc2VhcmNoIExhYikgPHRv bGpAd2FwbWUtc3lzdGVtcy5kZT6ItAQTAQIAHgUCP6mcYwIbAwYLCQgHAwIDFQID AxYCAQIeAQIXgAAKCRABV0w1BqPYRuSqA/wPzsQxao2YePENCtgRTrO86U6zg3sl OcS6CJFI4FZP5h/xD3GRsNH1+MPSvZlomDdpFnr547DGz/Kq9MXuQwVvlVig5yWZ K5dtKp1r5YLhxJQBhfirZbRFFnYmf19f18J8OoS28tuFVftDl1AIwJS3HLyBTv6H g2HyLAEKQIp30Q== =aYCI -END PGP PUBLIC KEY BLOCK-
Strange uptimes on smpp connections..
Hi there, I know this has been reported in the past, but Ive noticed it again... We have around 12 smpp connections out from our kannel server, and most of the uptimes are what i would expect, however some are off, ie: SMPP:smpp1.xxx smpp1 online 38909s 118 147 2 0 SMPP:smpp2.xxx smpp2 online 1075901068s 12 8 0 0 This is from version cvs-20040202, and both were started at the same time and havent dropped as far as i know. Let me know what kind of info to look at to try and trace it - Im not sure where to find it! Cheers, Bill.
Re: Strange uptimes on smpp connections..
> I know this has been reported in the past, but Ive noticed it > again... We have around 12 smpp connections out from our kannel > server, and most of the uptimes are what i would expect, however > some are off, ie: > > > SMPP:smpp1.xxx > smpp1 > online 38909s > 118 > 147 > 2 > 0 > > > SMPP:smpp2.xxx > smpp2 > online 1075901068s > 12 > 8 > 0 > 0 > > > > This is from version cvs-20040202, and both were started at the same > time and havent dropped as far as i know. > > Let me know what kind of info to look at to try and trace it - Im > not sure where to find it! Bill, can you do me a favor and check if this has been filed to http://bugs.kannel.org/. If not, please do so, so we keep track of it. BTW, the issue is known and we see it on our systems too. But currently it's of minor importance, so there seems non of us actively tracing it. If you have time and are eager, do so. Stipe mailto:[EMAIL PROTECTED] --- Wapme Systems AG Münsterstr. 248 40470 Düsseldorf, NRW, Germany phone: +49.211.74845.0 fax: +49.211.74845.299 mailto:[EMAIL PROTECTED] http://www.wapme-systems.de/ --- -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v1.2.2 (Cygwin) mIsEP6mcYwEEAMDnUiUwrbb+xwTFWN6TxF2+XZu7/alwJMeCwMBRvXtPZqfjpPhS OkBpU0F4TrVuugz1HINTSaJTYq10AzDQXp5NkyWgckqW79nPAWuOX0dicbJk+cN2 nM2TI4KaxUDe6u8hghNEnH/i2lXsUu9apnP/iixzV81VC2je3uc9hZpnAAYptEVT dGlwZSBUb2xqIChUZWNobm9sb2d5IENlbnRlciAmIFJlc2VhcmNoIExhYikgPHRv bGpAd2FwbWUtc3lzdGVtcy5kZT6ItAQTAQIAHgUCP6mcYwIbAwYLCQgHAwIDFQID AxYCAQIeAQIXgAAKCRABV0w1BqPYRuSqA/wPzsQxao2YePENCtgRTrO86U6zg3sl OcS6CJFI4FZP5h/xD3GRsNH1+MPSvZlomDdpFnr547DGz/Kq9MXuQwVvlVig5yWZ K5dtKp1r5YLhxJQBhfirZbRFFnYmf19f18J8OoS28tuFVftDl1AIwJS3HLyBTv6H g2HyLAEKQIp30Q== =aYCI -END PGP PUBLIC KEY BLOCK-
[PATCH] for xmlfunc.php for the http kannel monitor
Hi, I noticed that in the latest cvs, the kannel-monitor scripts in the contrib dir seems to be shifting the uptimes down one - this is because code has been shifted around and its calling things in the wrong order. I have attached a patch to fix this (not sure if in right format though - feel free to say how it should be done :) Cheers, Bill. xmlfunc.php.diff Description: Binary data
Re: Strange uptimes on smpp connections..
smpp smsc has even more problems, due to updates on shared variables between threads... it's all fixed in our tree, Stipe feel free to grab our smpp smsc (sorry no time todo it myself) On Wednesday 04 February 2004 14:40, Stipe Tolj wrote: > > I know this has been reported in the past, but Ive noticed it > > again... We have around 12 smpp connections out from our kannel > > server, and most of the uptimes are what i would expect, however > > some are off, ie: > > > > > > SMPP:smpp1.xxx > > smpp1 > > online 38909s > > 118 > > 147 > > 2 > > 0 > > > > > > SMPP:smpp2.xxx > > smpp2 > > online 1075901068s > > 12 > > 8 > > 0 > > 0 > > > > > > > > This is from version cvs-20040202, and both were started at the same > > time and havent dropped as far as i know. > > > > Let me know what kind of info to look at to try and trace it - Im > > not sure where to find it! > > Bill, can you do me a favor and check if this has been filed to > http://bugs.kannel.org/. If not, please do so, so we keep track of it. > > BTW, the issue is known and we see it on our systems too. But > currently it's of minor importance, so there seems non of us actively > tracing it. If you have time and are eager, do so. > > Stipe > > mailto:[EMAIL PROTECTED] > --- > Wapme Systems AG > > Münsterstr. 248 > 40470 Düsseldorf, NRW, Germany > > phone: +49.211.74845.0 > fax: +49.211.74845.299 > > mailto:[EMAIL PROTECTED] > http://www.wapme-systems.de/ > --- > > -BEGIN PGP PUBLIC KEY BLOCK- > Version: GnuPG v1.2.2 (Cygwin) > > mIsEP6mcYwEEAMDnUiUwrbb+xwTFWN6TxF2+XZu7/alwJMeCwMBRvXtPZqfjpPhS > OkBpU0F4TrVuugz1HINTSaJTYq10AzDQXp5NkyWgckqW79nPAWuOX0dicbJk+cN2 > nM2TI4KaxUDe6u8hghNEnH/i2lXsUu9apnP/iixzV81VC2je3uc9hZpnAAYptEVT > dGlwZSBUb2xqIChUZWNobm9sb2d5IENlbnRlciAmIFJlc2VhcmNoIExhYikgPHRv > bGpAd2FwbWUtc3lzdGVtcy5kZT6ItAQTAQIAHgUCP6mcYwIbAwYLCQgHAwIDFQID > AxYCAQIeAQIXgAAKCRABV0w1BqPYRuSqA/wPzsQxao2YePENCtgRTrO86U6zg3sl > OcS6CJFI4FZP5h/xD3GRsNH1+MPSvZlomDdpFnr547DGz/Kq9MXuQwVvlVig5yWZ > K5dtKp1r5YLhxJQBhfirZbRFFnYmf19f18J8OoS28tuFVftDl1AIwJS3HLyBTv6H > g2HyLAEKQIp30Q== > =aYCI > -END PGP PUBLIC KEY BLOCK- -- Best regards / Mit besten Grüßen aus Düsseldorf Dipl.-Ing. Alexander Malysh ___ Centrium GmbH Vogelsanger Weg 80 40470 Düsseldorf Fon: +49 (0211) 74 84 51 80 Fax: +49 (0211) 277 49 109 email: [EMAIL PROTECTED] web: www.centrium.de msn: [EMAIL PROTECTED] icq: 98063111 ___ Please avoid sending me Word, Excel or PowerPoint attachments. See http://www.fsf.org/philosophy/no-word-attachments.html
Re: Strange uptimes on smpp connections..
Alexander Malysh schrieb: > > smpp smsc has even more problems, due to updates on shared variables between > threads... it's all fixed in our tree, Stipe feel free to grab our smpp smsc > (sorry no time todo it myself) ok, I'll run a unified diff and see which items I can identify. Stipe mailto:[EMAIL PROTECTED] --- Wapme Systems AG Münsterstr. 248 40470 Düsseldorf, NRW, Germany phone: +49.211.74845.0 fax: +49.211.74845.299 mailto:[EMAIL PROTECTED] http://www.wapme-systems.de/ --- -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v1.2.2 (Cygwin) mIsEP6mcYwEEAMDnUiUwrbb+xwTFWN6TxF2+XZu7/alwJMeCwMBRvXtPZqfjpPhS OkBpU0F4TrVuugz1HINTSaJTYq10AzDQXp5NkyWgckqW79nPAWuOX0dicbJk+cN2 nM2TI4KaxUDe6u8hghNEnH/i2lXsUu9apnP/iixzV81VC2je3uc9hZpnAAYptEVT dGlwZSBUb2xqIChUZWNobm9sb2d5IENlbnRlciAmIFJlc2VhcmNoIExhYikgPHRv bGpAd2FwbWUtc3lzdGVtcy5kZT6ItAQTAQIAHgUCP6mcYwIbAwYLCQgHAwIDFQID AxYCAQIeAQIXgAAKCRABV0w1BqPYRuSqA/wPzsQxao2YePENCtgRTrO86U6zg3sl OcS6CJFI4FZP5h/xD3GRsNH1+MPSvZlomDdpFnr547DGz/Kq9MXuQwVvlVig5yWZ K5dtKp1r5YLhxJQBhfirZbRFFnYmf19f18J8OoS28tuFVftDl1AIwJS3HLyBTv6H g2HyLAEKQIp30Q== =aYCI -END PGP PUBLIC KEY BLOCK-
RE: PostgresSQL DLR support
Currently, I am fixing the start that Alexander made in dbpool_oracle.c. This means that we have 2 generic database functions, update(Octstr *sql) and select(Octstr *sql, List **result). (apart from configuration and shutdown routines). Would this not be sufficient?? I already made this for mysql, postgres, oracle (this one should exist already) and they work. I will also make this for ms sql server and -if needed- I can make this for sdb and sqlite. So far I programmed about 1000 lines in sqlbox and sql interfaces. Would this patch be accepted in current CVS? Kind regards, Rene Kluwen Chimit -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Behalf Of Stipe Tolj Sent: woensdag 4 februari 2004 14:00 To: Martin Atukunda Cc: [EMAIL PROTECTED] Subject: Re: PostgresSQL DLR support Martin Atukunda wrote: > I'd like a pointer to some of the projects that do this, so I can have a look > at them. There seems to be nothing database related at: > > http://kannel.org/roadmap.shtml#projects that roadmap is outdated totally. @Alex: we have to add things from our roadmap proposal here. I'll try to scratch things up this week. At least I got one good reference for the abstraction layer for DBs, which is the libdbi Project, see http://libdbi-drivers.sourceforge.net/ Stipe mailto:[EMAIL PROTECTED] --- Wapme Systems AG Münsterstr. 248 40470 Düsseldorf, NRW, Germany phone: +49.211.74845.0 fax: +49.211.74845.299 mailto:[EMAIL PROTECTED] http://www.wapme-systems.de/ --- -BEGIN PGP PUBLIC KEY BLOCK- Version: GnuPG v1.2.2 (Cygwin) mIsEP6mcYwEEAMDnUiUwrbb+xwTFWN6TxF2+XZu7/alwJMeCwMBRvXtPZqfjpPhS OkBpU0F4TrVuugz1HINTSaJTYq10AzDQXp5NkyWgckqW79nPAWuOX0dicbJk+cN2 nM2TI4KaxUDe6u8hghNEnH/i2lXsUu9apnP/iixzV81VC2je3uc9hZpnAAYptEVT dGlwZSBUb2xqIChUZWNobm9sb2d5IENlbnRlciAmIFJlc2VhcmNoIExhYikgPHRv bGpAd2FwbWUtc3lzdGVtcy5kZT6ItAQTAQIAHgUCP6mcYwIbAwYLCQgHAwIDFQID AxYCAQIeAQIXgAAKCRABV0w1BqPYRuSqA/wPzsQxao2YePENCtgRTrO86U6zg3sl OcS6CJFI4FZP5h/xD3GRsNH1+MPSvZlomDdpFnr547DGz/Kq9MXuQwVvlVig5yWZ K5dtKp1r5YLhxJQBhfirZbRFFnYmf19f18J8OoS28tuFVftDl1AIwJS3HLyBTv6H g2HyLAEKQIp30Q== =aYCI -END PGP PUBLIC KEY BLOCK-
Re: PostgresSQL DLR support
Hi Rene, if you wish that this patch will be accepted (or at least to get my +1), then please split your patches into logical complete changesets (e.g. oracle dbpool, oracle dlr, mysql dbpool, mysql dlr etc.). They should not depends on each other (if possible)... After review, you have (imo) a good chance that those will be accepted (or at least part of). Good luck and thanks in advance for your contribution! On Wednesday 04 February 2004 17:11, Rene Kluwen wrote: > Currently, I am fixing the start that Alexander made in dbpool_oracle.c. > This means that we have 2 generic database functions, update(Octstr *sql) > and select(Octstr *sql, List **result). > (apart from configuration and shutdown routines). Would this not be > sufficient?? > > I already made this for mysql, postgres, oracle (this one should exist > already) and they work. I will also make this for ms sql server and -if > needed- I can make this for sdb and sqlite. > > So far I programmed about 1000 lines in sqlbox and sql interfaces. > > Would this patch be accepted in current CVS? > > Kind regards, > > Rene Kluwen > Chimit > > > -Original Message- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > Behalf Of Stipe Tolj > Sent: woensdag 4 februari 2004 14:00 > To: Martin Atukunda > Cc: [EMAIL PROTECTED] > Subject: Re: PostgresSQL DLR support > > Martin Atukunda wrote: > > I'd like a pointer to some of the projects that do this, so I can have a > > look > > > at them. There seems to be nothing database related at: > > > > http://kannel.org/roadmap.shtml#projects > > that roadmap is outdated totally. > > @Alex: we have to add things from our roadmap proposal here. I'll try > to scratch things up this week. > > At least I got one good reference for the abstraction layer for DBs, > which is the libdbi Project, see > http://libdbi-drivers.sourceforge.net/ > > Stipe > > mailto:[EMAIL PROTECTED] > --- > Wapme Systems AG > > Münsterstr. 248 > 40470 Düsseldorf, NRW, Germany > > phone: +49.211.74845.0 > fax: +49.211.74845.299 > > mailto:[EMAIL PROTECTED] > http://www.wapme-systems.de/ > --- > > -BEGIN PGP PUBLIC KEY BLOCK- > Version: GnuPG v1.2.2 (Cygwin) > > mIsEP6mcYwEEAMDnUiUwrbb+xwTFWN6TxF2+XZu7/alwJMeCwMBRvXtPZqfjpPhS > OkBpU0F4TrVuugz1HINTSaJTYq10AzDQXp5NkyWgckqW79nPAWuOX0dicbJk+cN2 > nM2TI4KaxUDe6u8hghNEnH/i2lXsUu9apnP/iixzV81VC2je3uc9hZpnAAYptEVT > dGlwZSBUb2xqIChUZWNobm9sb2d5IENlbnRlciAmIFJlc2VhcmNoIExhYikgPHRv > bGpAd2FwbWUtc3lzdGVtcy5kZT6ItAQTAQIAHgUCP6mcYwIbAwYLCQgHAwIDFQID > AxYCAQIeAQIXgAAKCRABV0w1BqPYRuSqA/wPzsQxao2YePENCtgRTrO86U6zg3sl > OcS6CJFI4FZP5h/xD3GRsNH1+MPSvZlomDdpFnr547DGz/Kq9MXuQwVvlVig5yWZ > K5dtKp1r5YLhxJQBhfirZbRFFnYmf19f18J8OoS28tuFVftDl1AIwJS3HLyBTv6H > g2HyLAEKQIp30Q== > =aYCI > -END PGP PUBLIC KEY BLOCK- -- Best regards / Mit besten Grüßen aus Düsseldorf Dipl.-Ing. Alexander Malysh ___ Centrium GmbH Vogelsanger Weg 80 40470 Düsseldorf Fon: +49 (0211) 74 84 51 80 Fax: +49 (0211) 277 49 109 email: [EMAIL PROTECTED] web: www.centrium.de msn: [EMAIL PROTECTED] icq: 98063111 ___ Please avoid sending me Word, Excel or PowerPoint attachments. See http://www.fsf.org/philosophy/no-word-attachments.html
crash of kannel upon 'WTP Ack'-pdu
Hi, we've got a problem with wapbox here, it crashes after a "WSP Get". The Sequence of PDUs is: client -> kannel WSP Connect (TID 0x0015) kannel -> client WSP ConnectReply (TID 0x0015) client -> kannel WTP Ack (TID 0x0015) client -> kannel WSP Get (TID 0x0016) kannel -> client WTP Result (TID 0x0016) kannel -> client WSP Reply (TID 0x0016) client -> kannel WTP Ack (TID 0x0016) right after the last PDU, wapbox crashes with the following message: 2004-02-04 18:08:08 [8208] [0] PANIC: gwlib/list.c:486: lock: Assertion `list != NULL' failed. Line numbers i mention here refer to the current (30 minutes ago) CVS-Version. The (reverse-ordered) Sequence of function calls (manually traced since the backtrack()-function reports only the adresses but not the function names): gateway/gwlib/list.c:486:gw_assert(list != NULL); called from: static void lock(List *list) gateway/gwlib/list.c:175:lock(list); called from: void list_append(List *list, void *item) gateway/gwlib/list.c:406:list_append(list, item); called from: void list_produce(List *list, void *item) gateway/wap/wap_init.c:206:list_produce(queue, event); called from: void wtp_initiator_dispatch_event(WAPEvent *event) gateway/wap/wap.c:106:wtp_initiator_dispatch_event(event); called from: void wap_dispatch_datagram(WAPEvent *dgram) Could this be a bug of kannel, or is my client doing something nasty? Do you need any further information to clarify the issue? Thanks, Stefan
[PATCH] Sample code to support binding on list of specific IPs with correct replies
This will add support for: 1. Specifying multiple IPs in wdp-interface-name 2. When doing so, wdp replies will be sent from correct source IP (same that received original request) - this is really needed for some phones diff -urN kannel-snapshot/gw/bb_udp.c kannel-snapshot-stingr/gw/bb_udp.c --- kannel-snapshot/gw/bb_udp.c 2002-04-17 14:58:09.0 +0400 +++ kannel-snapshot-stingr/gw/bb_udp.c 2003-11-14 16:36:22.573483000 +0300 @@ -268,6 +268,8 @@ { Octstr *interface_name; CfgGroup *grp; +char* cIfaces; +char* cIf; int allow_wtls; if (udp_running) return -1; @@ -290,13 +292,18 @@ udpc_list = list_create(); /* have a list of running systems */ -add_service(9200, octstr_get_cstr(interface_name)); /* wsp */ -add_service(9201, octstr_get_cstr(interface_name)); /* wsp/wtp */ +cIfaces = strdup(octstr_get_cstr(interface_name)); +cIf = strtok(cIfaces, " ,;"); +while (cIf != NULL) { + info(0, "Adding interface %s", cIf); +add_service(9200, cIf); /* wsp */ +add_service(9201, cIf); /* wsp/wtp */ + #ifdef HAVE_WTLS_OPENSSL -if (allow_wtls) { -add_service(9202, octstr_get_cstr(interface_name));/* wsp/wtls */ -add_service(9203, octstr_get_cstr(interface_name));/* wsp/wtp/wtls */ -} +if (allow_wtls) { + add_service(9202, cIf);/* wsp/wtls*/ + add_service(9203, cIf);/* wsp/wtp/wtls */ +} #else if (allow_wtls) error(0, "These is a 'wtls' group in configuration, but no WTLS support compiled in!"); @@ -305,6 +312,9 @@ /* add_service(9205, octstr_get_cstr(interface_name)); * vcal */ /* add_service(9206, octstr_get_cstr(interface_name)); * vcard/wtls */ /* add_service(9207, octstr_get_cstr(interface_name)); * vcal/wtls*/ +cIf = strtok(NULL, " ,;"); +} +gw_free(cIfaces); octstr_destroy(interface_name); @@ -321,8 +331,9 @@ int udp_addwdp(Msg *msg) { int i; -Udpc *udpc; +Udpc *udpc, *def_udpc; +def_udpc = NULL; if (!udp_running) return -1; assert(msg != NULL); assert(msg_type(msg) == wdp_datagram); @@ -332,13 +343,23 @@ for (i=0; i < list_len(udpc_list); i++) { udpc = list_get(udpc_list, i); - if (msg->wdp_datagram.source_port == udp_get_port(udpc->addr)) - { - list_produce(udpc->outgoing_list, msg); - list_unlock(udpc_list); - return 0; + if (msg->wdp_datagram.source_port == udp_get_port(udpc->addr)) { + def_udpc = udpc; + if (octstr_compare(msg->wdp_datagram.source_address, udp_get_ip(udpc->addr)) == 0) + { + list_produce(udpc->outgoing_list, msg); + list_unlock(udpc_list); + return 0; + } } } + +if (NULL != def_udpc) { + list_produce(def_udpc->outgoing_list, msg); + list_unlock(udpc_list); + return 0; +} + list_unlock(udpc_list); return -1; } -- Paul P 'Stingray' Komkoff Jr // http://stingr.net/key <- my pgp key This message represents the official view of the voices in my head