Re: Re: smsc_smpp.c -- some minor fixes
Not to enter the discussions at last point but can you also remove all the - DAVE notes from the comments, especially where duplicate settings are removed and your comment just says so? Attach the final diff as an attachment so we can all quickly test and finalise it would be great Not meaning to moan :-) Alex
smpp minor fixes -- part 2
Here's my second try at the SMPP patch.
This patch:
*) Fixes bogus encodings on MO messages
*) Provides UDH support for MO messages
for SMPP connections.
Have fun, and thanks for the comments!
David WHITE
CONNECT AUSTRIA
-- PATCH --
===
RCS file: /home/cvs/gateway/gw/smsc/smsc_smpp.c,v
retrieving revision 1.22
diff -u -r1.22 smsc_smpp.c
--- gw/smsc/smsc_smpp.c 2 Jan 2003 14:43:00 - 1.22
+++ gw/smsc/smsc_smpp.c 12 Feb 2003 12:41:31 -
@@ -233,7 +233,8 @@
static Msg *pdu_to_msg(SMPP *smpp, SMPP_PDU *pdu)
{
-Msg *msg;
+Msg *msg;
+int udh_offset;
gw_assert(pdu-type == deliver_sm);
@@ -242,11 +243,19 @@
pdu-u.deliver_sm.source_addr = NULL;
msg-sms.receiver = pdu-u.deliver_sm.destination_addr;
pdu-u.deliver_sm.destination_addr = NULL;
-msg-sms.msgdata = pdu-u.deliver_sm.short_message;
-pdu-u.deliver_sm.short_message = NULL;
dcs_to_fields(msg, pdu-u.deliver_sm.data_coding);
-/* handle default data coding */
+if (pdu-u.deliver_sm.esm_class ESM_CLASS_SUBMIT_UDH_INDICATOR) {
+ udh_offset = octstr_get_char(pdu-u.deliver_sm.short_message,0)+1;
+ msg-sms.udhdata =
octstr_copy(pdu-u.deliver_sm.short_message,0,udh_offset);
+ msg-sms.msgdata =
octstr_copy(pdu-u.deliver_sm.short_message,udh_offset,octstr_len(pdu-u.deliver_sm.short_message)-udh_offset);
+} else {
+ // Take over pointer from pdu
+ msg-sms.msgdata = pdu-u.deliver_sm.short_message;
+ pdu-u.deliver_sm.short_message = NULL;
+}
+
+/* handle strange data codings and automatic translations */
switch (pdu-u.deliver_sm.data_coding) {
case 0x00: /* default SMSC alphabet */
/*
@@ -257,11 +266,10 @@
if (charset_convert(msg-sms.msgdata,
octstr_get_cstr(smpp-alt_charset), ISO-8859-1) != 0)
error(0, Failed to convert msgdata from charset
%s to %s, will leave as is.,
octstr_get_cstr(smpp-alt_charset),
ISO-8859-1);
-msg-sms.coding = DC_7BIT;
+ msg-sms.coding = DC_7BIT;
} else { /* assume GSM 03.38 7-bit alphabet */
charset_gsm_to_latin1(msg-sms.msgdata);
-msg-sms.coding = DC_7BIT;
}
break;
case 0x01: /* ASCII or IA5 - not sure if I need to do anything */
@@ -269,7 +277,7 @@
case 0x04: /* 8 bit binary - do nothing */
break;
case 0x03: /* ISO-8859-1 - do nothing */
-msg-sms.coding = DC_8BIT; break;
+break;
case 0x05: /* JIS - what do I do with that ? */
break;
case 0x06: /* Cyrllic - iso-8859-5, I'll convert to unicode */
@@ -288,7 +296,6 @@
* you implement them if you feel like it
*/
default:
-msg-sms.coding = DC_7BIT;
}
msg-sms.pid = pdu-u.deliver_sm.protocol_id;
kannel,installation wtls, please!
Hi all, please could anybody help me with this issue? Thanks a lot, Ivone From: Ivone Uribe [EMAIL PROTECTED] To: [EMAIL PROTECTED] Subject: kannel,installation wtls Date: Fri, 07 Feb 2003 23:36:49 + Hi friends, I'm trying to install the kannel 1.3.0 (in my redhat linux 7.2) with the wtls option, but I get this errors in the step make. could anyone help me with this issue? /root/nuevobg/gateway-1.3.0/wap/wtls.c:337: undefined reference to `wtls_decrypt_pdu_list' libwap.a(wtls.o): In function `wtls_event_handle': /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:20: undefined reference to `wtls_choose_ciphersuite' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:20: undefined reference to `wtls_choose_clientkeyid' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:20: undefined reference to `wtls_choose_snmode' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:20: undefined reference to `wtls_choose_krefresh' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:105: undefined reference to `wtls_get_random' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:164: undefined reference to `wtls_get_rsapublickey' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:236: undefined reference to `clienthellos_are_identical' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `wtls_decrypt_rsa' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `wtls_get_rsapublickey' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `wtls_calculate_prf' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `calculate_server_key_block' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `calculate_client_key_block' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `wtls_decrypt_pdu_list' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `wtls_hash' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `wtls_calculate_prf' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `wtls_hash' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:257: undefined reference to `wtls_calculate_prf' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:412: undefined reference to `is_critical_alert' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:422: undefined reference to `is_warning_alert' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:454: undefined reference to `clienthellos_are_identical' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:465: undefined reference to `clienthellos_are_identical' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:475: undefined reference to `packet_contains_changecipherspec' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:475: undefined reference to `packet_contains_finished' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:475: undefined reference to `packet_contains_userdata' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:487: undefined reference to `packet_contains_changecipherspec' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:487: undefined reference to `packet_contains_finished' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:487: undefined reference to `packet_contains_userdata' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:501: undefined reference to `is_critical_alert' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:511: undefined reference to `is_warning_alert' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:572: undefined reference to `packet_contains_userdata' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:608: undefined reference to `certificates_are_identical' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:608: undefined reference to `clientkeyexchanges_are_identical' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:608: undefined reference to `certifcateverifys_are_identical' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:608: undefined reference to `changecipherspecs_are_identical' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:608: undefined reference to `finisheds_are_indentical' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:623: undefined reference to `is_critical_alert' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:633: undefined reference to `is_warning_alert' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:684: undefined reference to `packet_contains_clienthello' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:694: undefined reference to `packet_contains_userdata' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:704: undefined reference to `packet_contains_changecipherspec' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:704: undefined reference to `packet_contains_finished' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:704: undefined reference to `packet_contains_userdata' /root/nuevobg/gateway-1.3.0/wap/wtls_state-decl.h:704: undefined reference to
Re: Fw: kannel dependancies
Bruno Rodrigues wrote: After Stipe releases devel 1.3.1, I'll generate and upload new debian packages for that release. I don't have time now for generating 1.3.0 packages when we are so close to 1.3.1 release. which will be in the upcoming days. (or even today, if I don't find anything better to do :)) Stipe [EMAIL PROTECTED] --- Wapme Systems AG Vogelsanger Weg 80 40470 Düsseldorf Tel: +49-211-74845-0 Fax: +49-211-74845-299 E-Mail: [EMAIL PROTECTED] Internet: http://www.wapme-systems.de --- wapme.net - wherever you are
Re: Problem with SMPP 3.3 SMSC in message delivery
Hi , The Kannel 1.0.3 version works fine, but the later versions give this error when the gw. receives the msg. (got DLR but could not find message or was not interested in it) This prob. is happening only with logica SMSC, I haven't faced this issue with any other SMSC. 2003-02-12 01:00:55 [5] DEBUG: SMPP PDU 0x811eb20 dump:2003-02-12 01:00:55 [5] DEBUG: type_name: deliver_sm2003-02-12 01:00:55 [5] DEBUG: command_id: 5 = 0x00052003-02-12 01:00:55 [5] DEBUG: command_status: 0 = 0x2003-02-12 01:00:55 [5] DEBUG: sequence_number: 3 = 0x00032003-02-12 01:00:55 [5] DEBUG: service_type: NULL2003-02-12 01:00:55 [5] DEBUG: source_addr_ton: 1 = 0x00012003-02-12 01:00:55 [5] DEBUG: source_addr_npi: 1 = 0x00012003-02-12 01:00:55 [5] DEBUG: source_addr: "12323434344"2003-02-12 01:00:55 [5] DEBUG: dest_addr_ton: 1 = 0x00012003-02-12 01:00:55 [5] DEBUG: dest_addr_npi: 1 = 0x00012003-02-12 01:00:55 [5] DEBUG: destination_addr: "1234567892"2003-02-12 01:00:55 [5] DEBUG: esm_class: 2 = 0x00022003-02-12 01:00:55 [5] DEBUG: protocol_id: 0 = 0x2003-02-12 01:00:55 [5] DEBUG: priority_flag: 0 = 0x2003-02-12 01:00:55 [5] DEBUG: schedule_delivery_time: NULL2003-02-12 01:00:55 [5] DEBUG: validity_period: NULL2003-02-12 01:00:55 [5] DEBUG: registered_delivery: 0 = 0x2003-02-12 01:00:55 [5] DEBUG: replace_if_present_flag: 0 = 0x2003-02-12 01:00:55 [5] DEBUG: data_coding: 0 = 0x2003-02-12 01:00:55 [5] DEBUG: sm_default_msg_id: 0 = 0x2003-02-12 01:00:55 [5] DEBUG: sm_length: 15 = 0x000f2003-02-12 01:00:55 [5] DEBUG: short_message: "another message"2003-02-12 01:00:55 [5] DEBUG: SMPP PDU dump ends.2003-02-12 01:00:55 [5] DEBUG: SMPP[tt] handle_pdu, got DLR2003-02-12 01:00:55 [5] ERROR: SMPP[tt]: got DLR but could not find message or was not interested in it2003-02-12 01:00:55 [5] DEBUG: SMPP[tt]: Sending PDU:2003-02-12 01:00:55 [5] DEBUG: SMPP PDU 0x811ecc0 dump:2003-02-12 01:00:55 [5] DEBUG: type_name: deliver_sm_resp2003-02-12 01:00:55 [5] DEBUG: command_id: 2147483653 = 0x80052003-02-12 01:00:55 [5] DEBUG: command_status: 0 = 0x2003-02-12 01:00:55 [5] DEBUG: sequence_number: 3 = 0x00032003-02-12 01:00:55 [5] DEBUG: message_id: NULL2003-02-12 01:00:55 [5] DEBUG: SMPP PDU dump ends.2003-02-12 01:01:03 [5] DEBUG: SMPP[tt]: Sending enquire link:2003-02-12 01:01:03 [5] DEBUG: SMPP PDU 0x811ecc0 dump:2003-02-12 01:01:03 [5] DEBUG: type_name: enquire_link2003-02-12 01:01:03 [5] DEBUG: command_id: 21 = 0x00152003-02-12 01:01:03 [5] DEBUG: command_status: 0 = 0x2003-02-12 01:01:03 [5] DEBUG: sequence_number: 24 = 0x00182003-02-12 01:01:03 [5] DEBUG: SMPP PDU dump ends. Regards Ritesh
