More support for return PDUs params and tlvs and more tests
This commit is contained in:
+16
-4
@@ -160,16 +160,23 @@ function session(sock) {
|
||||
*
|
||||
* @param obj or buf pdu
|
||||
* @param str status - see list at defs.errors - defaults to 'ESME_ROK' - no error (OPTIONAL)
|
||||
* @param obj params (OPTIONAL)
|
||||
* @param bol closeAfterSend - if true will close the socket after sending (OPTIONAL)
|
||||
* @param func callback(err) (OPTIONAL)
|
||||
* @param func callback(err, retPdu) (OPTIONAL)
|
||||
*/
|
||||
returnObj.sendReturn = function(pdu, status, closeAfterSend, callback) {
|
||||
returnObj.sendReturn = function(pdu, status, params, closeAfterSend, callback) {
|
||||
if (typeof params === 'function') {
|
||||
callback = params;
|
||||
params = undefined;
|
||||
closeAfterSend = undefined;
|
||||
}
|
||||
|
||||
if (typeof closeAfterSend === 'function') {
|
||||
callback = closeAfterSend;
|
||||
closeAfterSend = undefined;
|
||||
}
|
||||
|
||||
smppUtils.pduReturn(pdu, status, function(err, retPdu) {
|
||||
smppUtils.pduReturn(pdu, status, params, function(err, retPdu) {
|
||||
if (err) {
|
||||
log.error('larvitsmpp: lib/session.js: session() - returnObj.sendReturn() - Could not create return PDU: ' + err.message);
|
||||
returnObj.closeSocket();
|
||||
@@ -184,7 +191,7 @@ function session(sock) {
|
||||
returnObj.sockWrite(retPdu, closeAfterSend);
|
||||
|
||||
if (typeof callback === 'function') {
|
||||
callback();
|
||||
callback(null, retPdu);
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -215,6 +222,11 @@ function session(sock) {
|
||||
}
|
||||
|
||||
returnObj.send(pduObj, function(err, retPduObj) {
|
||||
|
||||
console.log('RAAAV');
|
||||
console.log(retPduObj);
|
||||
|
||||
|
||||
if (typeof callback === 'function') {
|
||||
callback(err, retPduObj.params.message_id, retPduObj);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user