TELECOM-11807: Add SO_MARK support

Author: benceszigeti

cfg.lex

@@ -318,6 +318,7 @@ SLASH		"/"
 AS			{EAT_ABLE}("as"|"AS"){EAT_ABLE}
 USE_WORKERS	{EAT_ABLE}("use_workers"|"USE_WORKERS"){EAT_ABLE}
 SOCK_TOS	{EAT_ABLE}("tos"|"TOS"){EAT_ABLE}
+MARK {EAT_ABLE}("mark"|"MARK"){EAT_ABLE}
 USE_AUTO_SCALING_PROFILE {EAT_ABLE}("use_auto_scaling_profile"|"USE_AUTO_SCALING_PROFILE"){EAT_ABLE}
 SCALE_UP_TO		{EAT_ABLE}("scale"|"SCALE"){EAT_ABLE}+("up"|"UP"){EAT_ABLE}+("to"|"TO"){EAT_ABLE}
 SCALE_DOWN_TO	{EAT_ABLE}("scale"|"SCALE"){EAT_ABLE}+("down"|"DOWN"){EAT_ABLE}+("to"|"TO"){EAT_ABLE}
@@ -600,6 +601,7 @@ SPACE		[ ]
 <INITIAL>{SEMICOLON}	{ count(); return SEMICOLON; }
 <INITIAL>{USE_WORKERS}  { count(); return USE_WORKERS; }
 <INITIAL>{SOCK_TOS}	{ count(); return SOCK_TOS; }
+<INITIAL>{MARK} { count(); return MARK; }
 <INITIAL>{USE_AUTO_SCALING_PROFILE}  { count(); return USE_AUTO_SCALING_PROFILE; }
 <INITIAL>{COLON}	{ count(); return COLON; }
 <INITIAL>{RPAREN}	{ count(); return RPAREN; }

cfg.y

@@ -183,6 +183,7 @@ struct listen_param {
 	enum si_flags flags;
 	int workers;
 	int tos;
+	int mark;
 	struct socket_id *socket;
 	char *tag;
 	char *auto_scaling_profile;
@@ -459,6 +460,7 @@ extern int cfg_parse_only_routes;
 %token AS
 %token USE_WORKERS
 %token SOCK_TOS
+%token MARK
 %token USE_AUTO_SCALING_PROFILE
 %token MAX
 %token MIN
@@ -763,6 +765,9 @@ socket_def_param: ANYCAST { IFOR();
 				| SOCK_TOS NUMBER { IFOR();
 					p_tmp.tos=$2;
 					}
+				| MARK NUMBER { IFOR();
+					p_tmp.mark = $2;
+					}
 				| AS listen_id_def { IFOR();
 					p_tmp.socket = $2;
 					}
@@ -2788,6 +2793,7 @@ static void fill_socket_id(struct listen_param *param, struct socket_id *s)
 		s->flags |= param->flags;
 		s->workers = param->workers;
 		s->tos = param->tos;
+		s->mark = param->mark;
 		s->auto_scaling_profile = param->auto_scaling_profile;
 		s->tag = param->tag;
 		if (param->socket) {

ip_addr.h

@@ -155,6 +155,7 @@ struct socket_id {
 	int port;
 	int workers;
 	int tos;
+	int mark;
 	enum si_flags flags;
 	struct socket_id* next;
 };

modules/cgrates/cgrates_engine.c

@@ -271,7 +271,7 @@ static int cgrc_conn(struct cgr_conn *c)
 
 	tcp_con_get_profile(&c->engine->su, src_su, PROTO_TCP, &prof);
 
-	s = tcp_sync_connect_fd(src_su, &c->engine->su, PROTO_TCP, &prof, 0, 0);
+	s = tcp_sync_connect_fd(src_su, &c->engine->su, PROTO_TCP, &prof, 0, 0, 0);
 	if (s < 0) {
 		LM_ERR("cannot connect to %.*s:%d\n", c->engine->host.len,
 				c->engine->host.s, c->engine->port);

modules/janus/ws_common.h

@@ -946,7 +946,7 @@ static int janus_ws_sync_connect(janus_connection *sock)
 
 	tcp_con_get_profile(to_su, src_su, PROTO_TCP, &sock->profile);
 
-	s = tcp_sync_connect_fd(src_su, to_su, PROTO_TCP, &sock->profile,0,0);
+	s = tcp_sync_connect_fd(src_su, to_su, PROTO_TCP, &sock->profile,0,0,0);
 	if (s < 0) {
 		LM_ERR("cannot TCP connect to %.*s:%d\n",
 		sock->parsed_url.host.len,sock->parsed_url.host.s,

net/net_tcp.c

@@ -2551,7 +2551,8 @@ static int tcpconn_prepare_write(struct tcp_connection *tcpconn)
 		fd = tcp_sync_connect_fd(&tcpconn->rcv.bind_address->su,
 				&tcpconn->rcv.src_su, tcpconn->type, &tcpconn->profile,
 				tcpconn->rcv.bind_address->flags,
-				tcpconn->rcv.bind_address->tos);
+				tcpconn->rcv.bind_address->tos,
+				tcpconn->rcv.bind_address->mark);
 		if (fd < 0)
 			return -1;
 

net/tcp_common.c

@@ -175,7 +175,7 @@ int tcp_connect_blocking(int fd, const struct sockaddr *servaddr,
 }
 
 int tcp_sync_connect_fd(const union sockaddr_union* src, const union sockaddr_union* dst,
-                 enum sip_protos proto, const struct tcp_conn_profile *prof, enum si_flags flags, int sock_tos)
+                 enum sip_protos proto, const struct tcp_conn_profile *prof, enum si_flags flags, int sock_tos, int mark)
 {
 	int s;
 	union sockaddr_union my_name;
@@ -192,6 +192,17 @@ int tcp_sync_connect_fd(const union sockaddr_union* src, const union sockaddr_un
 		goto error;
 	}
 
+	if (mark > 0) {
+#ifdef SO_MARK
+		if (setsockopt(s, SOL_SOCKET, SO_MARK, &mark, sizeof(mark)) < 0) {
+			LM_ERR("SO_MARK setsockopt failed (%d) %s\n", errno, strerror(errno));
+			goto error;
+		}
+#else
+		LM_WARN("SO_MARK not available on this platform\n");
+#endif
+	}
+
 	if (src) {
 		my_name_len = sockaddru_len(*src);
 		memcpy( &my_name, src, my_name_len);

net/tcp_common.h

@@ -31,7 +31,7 @@ int tcp_connect_blocking_timeout(int fd, const struct sockaddr *servaddr,
 
 
 int tcp_sync_connect_fd(const union sockaddr_union* src, const union sockaddr_union* dst,
-                 enum sip_protos proto, const struct tcp_conn_profile *prof, enum si_flags flags, int sock_tos);
+                 enum sip_protos proto, const struct tcp_conn_profile *prof, enum si_flags flags, int sock_tos, int mark);
 
 struct tcp_connection* tcp_sync_connect(const struct socket_info* send_sock,
                const union sockaddr_union* server, struct tcp_conn_profile *prof,

socket_info.c

@@ -150,6 +150,10 @@ struct socket_info_full* new_sock_info(struct socket_id *sid, str *orig_name)
 	si->proto=sid->proto;
 	si->flags=sid->flags;
 
+	if (sid->mark) {
+		si->mark = sid->mark;
+	}
+
 	/* advertised socket information */
 	/* Make sure the adv_sock_string is initialized, because if there is
 	 * no adv_sock_name, no other code will initialize it!

socket_info.h

@@ -68,6 +68,7 @@ struct socket_info {
 	unsigned short adv_port;    /* optimization for grep_sock_info() */
 	unsigned short workers;
 	unsigned short tos;
+	int mark;
 	struct scaling_profile *s_profile;
 	void *extra_data;
 	struct socket_info_ref *bond_sis;