net: initial proxy_protocol implementation

Author: razvancrainea

ip_addr.h

@@ -41,6 +41,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include "str.h"
+#include "net/proxy_protocol.h"
 
 
 #include "dprint.h"
@@ -86,6 +87,17 @@ union sockaddr_union{
 		struct sockaddr_in6 sin6;
 };
 
+enum proxy_protocol_flags {
+	PP_INIT, PP_ERROR, PP_UNKNOWN, PP_OK
+};
+
+struct proxy_protocol {
+	enum proxy_protocol_flags flags;
+	struct ip_addr src_ip;
+	struct ip_addr dst_ip;
+	unsigned short src_port; /*!< host byte order */
+	unsigned short dst_port; /*!< host byte order */
+};
 
 
 enum si_flags { SI_NONE=0, SI_IS_IP=1, SI_IS_LO=2, SI_IS_MCAST=4,
@@ -101,9 +113,19 @@ struct receive_info {
 	unsigned int proto_reserved2;
 	union sockaddr_union src_su; /*!< useful for replies*/
 	const struct socket_info* bind_address; /*!< sock_info structure on which the msg was received*/
+	struct proxy_protocol real_ep; /*!< real endpoint of the mssage (behind a proxy protocol) */
 	/* no need for dst_su yet */
 };
 
+#define get_rcv_src_ip(_rcv) \
+	(((_rcv)->real_ep.flags == PP_OK)?&(_rcv)->real_ep.src_ip:&(_rcv)->src_ip)
+#define get_rcv_src_port(_rcv) \
+	(((_rcv)->real_ep.flags == PP_OK)?(_rcv)->real_ep.src_port:(_rcv)->src_port)
+#define get_rcv_dst_ip(_rcv) \
+	(((_rcv)->real_ep.flags == PP_OK)?&(_rcv)->real_ep.dst_ip:&(_rcv)->dst_ip)
+#define get_rcv_dst_port(_rcv) \
+	(((_rcv)->real_ep.flags == PP_OK)?(_rcv)->real_ep.dst_port:(_rcv)->dst_port)
+
 
 struct dest_info {
 	int proto;

modules/pike/pike_funcs.c

@@ -113,7 +113,7 @@ int pike_check_req(struct sip_msg *msg)
 	if (ip==0)
 		return -1;
 #else
-	ip = &(msg->rcv.src_ip);
+	ip = get_rcv_src_ip(&msg->rcv);
 #endif
 
 

modules/proto_tls/proto_tls.c

@@ -651,6 +651,15 @@ static int tls_read_req(struct tcp_connection* con, int* bytes_read)
 		req=&tls_current_req;
 	}
 
+	switch (check_tcp_proxy_protocol(con)) {
+	case 0:
+		goto done;
+	case -1:
+		goto error;
+	case 1:
+		break;
+	}
+
 	/* do this trick in order to trace whether if it's an error or not */
 	ret=tls_mgm_api.tls_fix_read_conn(con, con->fd, tls_handshake_tout, t_dst, 1);
 

modules/tracer/tracer.c

@@ -2136,7 +2136,7 @@ static int sip_trace(struct sip_msg *msg, trace_info_p info, int leg_flag)
 	}
 
 	set_sock_columns( db_vals[4], db_vals[5], db_vals[6], fromip_buff,
-		&msg->rcv.src_ip, msg->rcv.src_port, msg->rcv.proto);
+		get_rcv_src_ip(&msg->rcv), get_rcv_src_port(&msg->rcv), msg->rcv.proto);
 
 	set_sock_columns( db_vals[7], db_vals[8], db_vals[9], toip_buff,
 		TRACE_GET_DST_IP(msg), TRACE_GET_DST_PORT(msg), msg->rcv.proto);
@@ -2223,7 +2223,7 @@ static int sip_trace_instance(struct sip_msg* msg,
 	}
 
 	set_sock_columns( db_vals[4], db_vals[5], db_vals[6], fromip_buff,
-		&msg->rcv.src_ip, msg->rcv.src_port, msg->rcv.proto);
+		get_rcv_src_ip(&msg->rcv), get_rcv_src_port(&msg->rcv), msg->rcv.proto);
 
 	set_sock_columns( db_vals[7], db_vals[8], db_vals[9], toip_buff,
 		TRACE_GET_DST_IP(msg), TRACE_GET_DST_PORT(msg), msg->rcv.proto);
@@ -2449,9 +2449,11 @@ static void trace_msg_out(struct sip_msg* msg, str  *sbuf,
 {
 	static char fromip_buff[IP_ADDR_MAX_STR_SIZE+12];
 	static char toip_buff[IP_ADDR_MAX_STR_SIZE+12];
-	struct ip_addr to_ip;
+	struct ip_addr to_ip, *ip;
+	struct receive_info ri;
 	trace_instance_p instance;
 	str from_tag;
+	unsigned int port;
 
 	if(parse_from_and_callid(msg, &from_tag) != 0)
 	{
@@ -2513,12 +2515,18 @@ static void trace_msg_out(struct sip_msg* msg, str  *sbuf,
 	{
 		set_columns_to_any(db_vals[7], db_vals[8], db_vals[9]);
 	} else {
+		if (proto != PROTO_UDP && info->conn_id &&
+				tcp_get_rcv(info->conn_id, &ri) == 0) {
+			ip = get_rcv_src_ip(&ri);
+			port = get_rcv_src_port(&ri);
+		} else {
+			ip = &to_ip;
+			port = (unsigned int)(send_sock && send_sock->last_real_ports->remote?
+				send_sock->last_real_ports->remote:su_getport(to));
+		}
 		su2ip_addr(&to_ip, to);
 		set_sock_columns( db_vals[7], db_vals[8], db_vals[9], toip_buff,
-			&to_ip,
-			(unsigned long)(send_sock && send_sock->last_real_ports->remote?
-				send_sock->last_real_ports->remote:su_getport(to)),
-			proto);
+			ip, port, proto);
 	}
 
 	db_vals[10].val.time_val = time(NULL);
@@ -2621,7 +2629,7 @@ static void trace_onreply_in(struct cell* t, int type, struct tmcb_params *ps,
 	db_vals[3].val.str_val.len = len;
 
 	set_sock_columns( db_vals[4], db_vals[5], db_vals[6], fromip_buff,
-		&msg->rcv.src_ip,  msg->rcv.src_port, msg->rcv.proto);
+		get_rcv_src_ip(&msg->rcv), get_rcv_src_port(&msg->rcv), msg->rcv.proto);
 
 	if(trace_local_ip.s && trace_local_ip.len > 0){
 		set_columns_to_trace_local_ip(db_vals[7], db_vals[8], db_vals[9]);
@@ -2690,12 +2698,14 @@ static void trace_onreply_out(struct cell* t, int type, struct tmcb_params *ps,
 	static char toip_buff[IP_ADDR_MAX_STR_SIZE+12];
 	trace_instance_p instance;
 	struct sip_msg* msg;
-	struct ip_addr to_ip;
+	struct ip_addr to_ip, *ip;
+	struct receive_info ri;
 	int len;
 	char statusbuf[8];
 	str *sbuf;
 	struct dest_info *dst;
 	str from_tag;
+	unsigned int port;
 
 	trace_info_t info;
 
@@ -2797,13 +2807,19 @@ static void trace_onreply_out(struct cell* t, int type, struct tmcb_params *ps,
 	{
 		set_columns_to_any( db_vals[7], db_vals[8], db_vals[9]);
 	} else {
+		if (dst->proto != PROTO_UDP && info.conn_id &&
+				tcp_get_rcv(info.conn_id, &ri) == 0) {
+			ip = get_rcv_src_ip(&ri);
+			port = get_rcv_src_port(&ri);
+		} else {
+			ip = &to_ip;
+			port = (unsigned int)(dst->send_sock && dst->send_sock->last_real_ports->remote?
+				dst->send_sock->last_real_ports->remote:su_getport(&dst->to));
+		}
 		memset(&to_ip, 0, sizeof(struct ip_addr));
 		su2ip_addr(&to_ip, &dst->to);
 		set_sock_columns( db_vals[7], db_vals[8], db_vals[9], toip_buff,
-			&to_ip,
-			(unsigned long)(dst->send_sock && dst->send_sock->last_real_ports->remote?
-				dst->send_sock->last_real_ports->remote:su_getport(&dst->to)),
-			dst->proto);
+			ip, port, dst->proto);
 	}
 
 	db_vals[10].val.time_val = time(NULL);

net/net_tcp.c

@@ -468,6 +468,21 @@ int tcp_get_correlation_id( unsigned int id, unsigned long long *cid)
 	return -1;
 }
 
+/* returns the correlation ID of a TCP connection */
+int tcp_get_rcv( unsigned int id, struct receive_info *ri)
+{
+	struct tcp_connection* c;
+
+	TCPCONN_LOCK(id);
+	if ( (c=_tcpconn_find(id))!=NULL ) {
+		memcpy(ri, &c->rcv, sizeof *ri);
+		TCPCONN_UNLOCK(id);
+		return 0;
+	}
+	TCPCONN_UNLOCK(id);
+	return -1;
+}
+
 
 /*! \brief _tcpconn_find with locks and acquire fd */
 int tcp_conn_get(unsigned int id, struct ip_addr* ip, int port,

net/net_tcp.h

@@ -110,6 +110,9 @@ int tcp_conn_fcntl(struct receive_info *rcv, int attr, void *value);
 /* returns the correlation ID of a TCP connection */
 int tcp_get_correlation_id( unsigned int id, unsigned long long *cid);
 
+/* returns the receive_info of a TCP connection */
+int tcp_get_rcv(unsigned int id, struct receive_info *ri);
+
 int tcp_done_reading(struct tcp_connection* c);
 
 extern unsigned int last_outgoing_tcp_id;

net/proto_tcp/proto_tcp.c

@@ -651,7 +651,7 @@ int tcp_read(struct tcp_connection *c,struct tcp_req *r)
  */
 static int tcp_read_req(struct tcp_connection* con, int* bytes_read)
 {
-	int bytes, rc;
+	int bytes, rc = 0;
 	int total_bytes;
 	struct tcp_req* req;
 
@@ -688,6 +688,15 @@ static int tcp_read_req(struct tcp_connection* con, int* bytes_read)
 		req=&tcp_current_req;
 	}
 
+	switch (check_tcp_proxy_protocol(con)) {
+	case 0:
+		goto done;
+	case -1:
+		goto error;
+	case 1:
+		break;
+	}
+
 again:
 	if(req->error==TCP_REQ_OK){
 		/* if we still have some unparsed part, parse it first,

net/proto_udp/proto_udp.c

@@ -37,6 +37,7 @@
 #include "../api_proto.h"
 #include "../api_proto_net.h"
 #include "../net_udp.h"
+#include "../proxy_protocol.h"
 #include "proto_udp.h"
 
 
@@ -149,14 +150,6 @@ static int udp_read_req(const struct socket_info *si, int* bytes_read)
 		return -2;
 	}
 
-	if (len<MIN_UDP_PACKET) {
-		LM_DBG("probing packet received len = %d\n", len);
-		return 0;
-	}
-
-	/* we must 0-term the messages, receive_msg expects it */
-	buf[len]=0; /* no need to save the previous char */
-
 	ri.bind_address = si;
 	ri.dst_port = si->port_no;
 	ri.dst_ip = si->address;
@@ -169,6 +162,17 @@ static int udp_read_req(const struct socket_info *si, int* bytes_read)
 	msg.s = buf;
 	msg.len = len;
 
+	if (check_udp_proxy_protocol(&msg.s, &msg.len, &ri) < 0)
+		return 0;
+
+	if (msg.len<MIN_UDP_PACKET) {
+		LM_DBG("probing packet received len = %d\n", msg.len);
+		return 0;
+	}
+
+	/* we must 0-term the messages, receive_msg expects it */
+	msg.s[msg.len]=0; /* no need to save the previous char */
+
 	/* run callbacks if looks like non-SIP message*/
 	if( !isalpha(msg.s[0]) ){    /* not-SIP related */
 		for(p = cb_list; p; p = p->next){
@@ -257,4 +261,3 @@ int register_udprecv_cb(udp_rcv_cb_f* func, void* param, char a, char b)
 
 
 
-