smpp: rework TCP connections

modules/proto_smpp/proto_smpp.c

@@ -259,6 +259,7 @@ static struct tcp_req smpp_current_req;
 static int smpp_handle_req(struct tcp_req *req, struct tcp_connection *con)
 {
 	long size;
+	struct receive_info local_rcv;
 
 	if (req->complete){
 		/* update the timeout - we successfully read the request */
@@ -287,9 +288,10 @@ static int smpp_handle_req(struct tcp_req *req, struct tcp_connection *con)
 			LM_DBG("We still have things on the pipe - "
 				"keeping connection \n");
 		}
+		local_rcv = con->rcv;
 
 		/* give the message to the registered functions */
-		handle_smpp_msg(req->buf, con);
+		handle_smpp_msg(req->buf, (smpp_session_t *)con->proto_data, &local_rcv);
 
 		if (!size && req != &smpp_current_req) {
 			/* if we no longer need this tcp_req

modules/proto_smpp/proto_smpp.h

@@ -42,7 +42,7 @@ typedef struct smpp_session {
 	struct ip_addr ip;
 	int port;
 
-	struct tcp_connection *conn;
+	int conn_id;
 
 	union {
 		smpp_bind_receiver_t receiver;
@@ -68,7 +68,7 @@ struct tcp_connection* smpp_sync_connect(struct socket_info* send_sock,
 
 void enquire_link(unsigned int ticks, void *param);
 void rpc_bind_sessions(int sender_id, void *param);
-void handle_smpp_msg(char *buffer, struct tcp_connection *conn);
+void handle_smpp_msg(char *buffer, smpp_session_t *session, struct receive_info *rcv);
 void send_submit_or_deliver_request(str *msg, str *src, str *dst,
 		smpp_session_t *session);
 smpp_session_t *smpp_session_new(str *name, struct ip_addr *ip, int port,