diff -uNr gw/dlr.c gw/dlr.c --- gw/dlr.c 2014-01-30 16:39:26.000000000 +0500 +++ gw/dlr.c 2014-01-29 15:10:15.000000000 +0500 @@ -362,6 +362,16 @@ dlr->boxc_id = (msg->sms.boxc_id ? octstr_duplicate(msg->sms.boxc_id) : octstr_create("")); dlr->mask = msg->sms.dlr_mask; + + dlr->source_ton = (msg->sms.source_ton); + dlr->source_addr = octstr_duplicate(msg->sms.source_addr); + dlr->source_addr_npi = (msg->sms.source_addr_npi); + dlr->dest_addr_npi = (msg->sms.dest_addr_npi); + dlr->dest_addr_ton = msg->sms.dest_addr_ton; + dlr->destination_addr = octstr_duplicate(msg->sms.destination_addr); + dlr->esm_class = msg->sms.esm_class; + dlr->service_type = octstr_duplicate(msg->sms.service_type); + debug("dlr.dlr", 0, "DLR[%s]: Adding DLR smsc=%s, ts=%s, src=%s, dst=%s, mask=%d, boxc=%s", dlr_type(), octstr_get_cstr(dlr->smsc), octstr_get_cstr(dlr->timestamp), octstr_get_cstr(dlr->source), octstr_get_cstr(dlr->destination), dlr->mask, octstr_get_cstr(dlr->boxc_id)); @@ -436,6 +446,8 @@ time(&msg->sms.time); debug("dlr.dlr", 0, "DLR[%s]: created DLR message for URL <%s>", dlr_type(), (msg->sms.dlr_url?octstr_get_cstr(msg->sms.dlr_url):"")); + debug("dlr.dlr", 0, "DLR[%s]: created DLR message for Destination_ton <%s>", + dlr_type(), (msg->sms.dlr_url?octstr_get_cstr(dlr->source_ton):"")); } else { debug("dlr.dlr", 0, "DLR[%s]: Ignoring DLR message because of mask type=%d dlr->mask=%d", dlr_type(), typ, dlr->mask); /* ok that was a status report but we where not interested in having it */ @@ -501,7 +513,15 @@ dlrmsg->sms.msgdata = octstr_duplicate(reply); dlrmsg->sms.boxc_id = octstr_duplicate(msg->sms.boxc_id); dlrmsg->sms.foreign_id = octstr_duplicate(msg->sms.foreign_id); - time(&dlrmsg->sms.time); + dlrmsg->sms.source_ton = (msg->sms.source_ton); + dlrmsg->sms.source_addr = octstr_duplicate(msg->sms.source_addr); + dlrmsg->sms.source_addr_npi = (msg->sms.source_addr_npi); + dlrmsg->sms.dest_addr_npi = (msg->sms.dest_addr_npi); + dlrmsg->sms.dest_addr_ton = msg->sms.dest_addr_ton; + dlrmsg->sms.destination_addr = octstr_duplicate(msg->sms.destination_addr); + dlrmsg->sms.esm_class = msg->sms.esm_class; + dlrmsg->sms.service_type = octstr_duplicate(msg->sms.service_type); + time(&dlrmsg->sms.time); debug("dlr.dlr", 0,"SMSC[%s]: DLR = %s", (smsc ? octstr_get_cstr(smsc) : "UNKNOWN"), diff -uNr gw/dlr_p.h gw/dlr_p.h --- gw/dlr_p.h 2014-01-30 16:39:26.000000000 +0500 +++ gw/dlr_p.h 2014-01-29 15:10:15.000000000 +0500 @@ -84,6 +84,14 @@ Octstr *url; Octstr *boxc_id; int mask; + int source_ton; + Octstr * source_addr; + int source_addr_npi; + Octstr * destination_addr; + int dest_addr_ton; + int dest_addr_npi; + int esm_class; + Octstr * service_type; }; /* diff -uNr gw/msg-decl.h gw/msg-decl.h --- gw/msg-decl.h 2014-01-30 16:39:26.000000000 +0500 +++ gw/msg-decl.h 2014-01-29 15:10:14.000000000 +0500 @@ -111,6 +111,14 @@ INTEGER(resend_try) INTEGER(resend_time) OCTSTR(meta_data) + INTEGER(source_ton) + OCTSTR(source_addr) + INTEGER(source_addr_npi) + OCTSTR(destination_addr) + INTEGER (dest_addr_ton) + INTEGER(dest_addr_npi) + INTEGER(esm_class) + OCTSTR(service_type) }) MSG(ack, diff -uNr gw/smsbox.c gw/smsbox.c --- gw/smsbox.c 2014-01-30 16:39:26.000000000 +0500 +++ gw/smsbox.c 2014-01-29 15:10:15.000000000 +0500 @@ -1685,7 +1685,11 @@ } else { trans = urltrans_find_service(translations, msg); } - + info(0, "Starting delivery report <%s> Destination <%s> esm_class <%ld> from <%s>", + octstr_get_cstr(msg->sms.service), + octstr_get_cstr(msg->sms.destination_addr), + (msg->sms.esm_class), + octstr_get_cstr(msg->sms.sender)); info(0, "Starting delivery report <%s> from <%s>", octstr_get_cstr(msg->sms.service), octstr_get_cstr(msg->sms.sender)); diff -uNr gw/smsc/smsc_smpp.c gw/smsc/smsc_smpp.c --- gw/smsc/smsc_smpp.c 2014-01-30 16:39:37.000000000 +0500 +++ gw/smsc/smsc_smpp.c 2014-01-30 14:49:30.000000000 +0500 @@ -1157,6 +1157,17 @@ if (send_pdu(conn, smpp->conn->id, pdu) == 0) { struct smpp_msg *smpp_msg = smpp_msg_create(msg); os = octstr_format("%ld", pdu->u.submit_sm.sequence_number); + smpp_msg->msg->sms.source_ton = pdu->u.submit_sm.source_addr_ton; + smpp_msg->msg->sms.source_addr_npi = pdu->u.submit_sm.source_addr_npi; + smpp_msg->msg->sms.dest_addr_ton = pdu->u.submit_sm.dest_addr_ton; + smpp_msg->msg->sms.dest_addr_npi = pdu->u.submit_sm.dest_addr_npi; + smpp_msg->msg->sms.source_addr = pdu->u.submit_sm.source_addr; + smpp_msg->msg->sms.destination_addr = pdu->u.submit_sm.destination_addr; + smpp_msg->msg->sms.esm_class = pdu->u.submit_sm.esm_class; + smpp_msg->msg->sms.service_type = octstr_create(""); + octstr_append_data(smpp_msg->msg->sms.service_type, pdu->type_name, strlen(pdu->type_name)); + pdu->u.submit_sm.source_addr = NULL; + pdu->u.submit_sm.destination_addr = NULL; dict_put(smpp->sent_msgs, os, smpp_msg); smpp_pdu_destroy(pdu); octstr_destroy(os); @@ -1667,16 +1678,31 @@ dlrmsg = handle_dlr(smpp, pdu->u.deliver_sm.source_addr, pdu->u.deliver_sm.short_message, pdu->u.deliver_sm.message_payload, pdu->u.deliver_sm.receipted_message_id, pdu->u.deliver_sm.message_state, pdu->u.deliver_sm.network_error_code); + resp = smpp_pdu_create(deliver_sm_resp, pdu->u.deliver_sm.sequence_number); - if (dlrmsg != NULL) { + + if (dlrmsg != NULL) { if (dlrmsg->sms.meta_data == NULL) dlrmsg->sms.meta_data = octstr_create(""); + dlrmsg->sms.source_ton = pdu->u.deliver_sm.source_addr_ton; + dlrmsg->sms.source_addr = octstr_duplicate(pdu->u.deliver_sm.source_addr); + dlrmsg->sms.source_addr_npi = (pdu->u.deliver_sm.source_addr_npi); + dlrmsg->sms.dest_addr_npi = (pdu->u.deliver_sm.dest_addr_npi); + dlrmsg->sms.dest_addr_ton = pdu->u.deliver_sm.dest_addr_ton; + dlrmsg->sms.destination_addr = octstr_duplicate(pdu->u.deliver_sm.destination_addr); + dlrmsg->sms.esm_class = pdu->u.deliver_sm.esm_class; + dlrmsg->sms.service_type = octstr_create(""); + octstr_append_data(dlrmsg->sms.service_type, pdu->type_name, strlen(pdu->type_name)); + meta_data_set_values(dlrmsg->sms.meta_data, pdu->u.deliver_sm.tlv, "smpp", 0); reason = bb_smscconn_receive(smpp->conn, dlrmsg); } else reason = SMSCCONN_SUCCESS; resp->u.deliver_sm_resp.command_status = smscconn_failure_reason_to_smpp_status(reason); } else {/* MO-SMS */ + debug("bb.sms.smpp",0,"SMPP[%s] handle_pdu, got DLR2", + octstr_get_cstr(smpp->conn->id)); + resp = smpp_pdu_create(deliver_sm_resp, pdu->u.deliver_sm.sequence_number); /* ensure the smsc-id is set */ @@ -1695,6 +1721,22 @@ time(&msg->sms.time); msg->sms.smsc_id = octstr_duplicate(smpp->conn->id); msg->sms.account = octstr_duplicate(smpp->username); + + debug("bb.sms.smpp",0,"SMPP[%s] handle_pdu, got DLR23 Source_Addr - <%s> and Dest_addr - <%s>", + octstr_get_cstr(smpp->conn->id), + octstr_get_cstr(msg->sms.source_addr), + octstr_get_cstr(msg->sms.destination_addr) + ); + msg->sms.source_addr = octstr_duplicate(msg->sms.sender); + msg->sms.destination_addr = octstr_duplicate(msg->sms.receiver); + msg->sms.source_ton = pdu->u.deliver_sm.source_addr_ton; + msg->sms.source_addr_npi = (pdu->u.deliver_sm.source_addr_npi); + msg->sms.dest_addr_npi = (pdu->u.deliver_sm.dest_addr_npi); + msg->sms.dest_addr_ton = pdu->u.deliver_sm.dest_addr_ton; + msg->sms.esm_class = pdu->u.deliver_sm.esm_class; + msg->sms.service_type = octstr_create(""); + octstr_append_data(msg->sms.service_type, pdu->type_name, strlen(pdu->type_name)); + reason = bb_smscconn_receive(smpp->conn, msg); resp->u.deliver_sm_resp.command_status = smscconn_failure_reason_to_smpp_status(reason); } @@ -1715,7 +1757,9 @@ break; case submit_sm_resp: - os = octstr_format("%ld", pdu->u.submit_sm_resp.sequence_number); + debug("bb.sms.smpp",0,"SMPP[%s] handle_pdu, got RESP", + octstr_get_cstr(smpp->conn->id)); + os = octstr_format("%ld", pdu->u.submit_sm_resp.sequence_number); smpp_msg = dict_remove(smpp->sent_msgs, os); octstr_destroy(os); if (smpp_msg == NULL) { diff -uNr gw/urltrans.c gw/urltrans.c --- gw/urltrans.c 2014-01-30 16:39:26.000000000 +0500 +++ gw/urltrans.c 2014-01-29 15:10:14.000000000 +0500 @@ -378,6 +378,52 @@ octstr_destroy(enc); } break; + case 'e': + if (request->sms.source_addr) { + enc = octstr_duplicate(request->sms.source_addr); + octstr_url_encode(enc); + octstr_append(result, enc); + octstr_destroy(enc); + } + break; + + case 'E': + if (request->sms.source_addr) { + enc = octstr_duplicate(request->sms.destination_addr); + octstr_url_encode(enc); + octstr_append(result, enc); + octstr_destroy(enc); + } + break; + + case 'g': + octstr_append_decimal(result, request->sms.source_ton); + break; + + case 'G': + octstr_append_decimal(result, request->sms.dest_addr_ton); + break; + + case 'h': + octstr_append_decimal(result, request->sms.source_addr_npi); + break; + + case 'H': + octstr_append_decimal(result, request->sms.dest_addr_npi); + break; + + case 'j': + octstr_append_decimal(result, request->sms.esm_class); + break; + + case 'J': + if (request->sms.service_type) { + enc = octstr_duplicate(request->sms.service_type); + octstr_url_encode(enc); + octstr_append(result, enc); + octstr_destroy(enc); + } + break; case 'b': enc = octstr_duplicate(request->sms.msgdata);