@@ -105,6 +105,9 @@ int do_action(struct action* a, struct sip_msg* msg)

 		case FORWARD_T:

 #ifdef USE_TCP

 		case FORWARD_TCP_T:

+#endif

+#ifdef USE_TLS

+		case FORWARD_TLS_T:

 #endif

 		case FORWARD_UDP_T:

@@ -106,6 +106,7 @@

 #define SRV_UDP_PREFIX "_sip._udp."

 #define SRV_TCP_PREFIX "_sip._tcp."

+#define SRV_TLS_PREFIX "_sip._tls."

 #define SRV_PREFIX_LEN 10

 /*used only if PKG_MALLOC is defined*/

@@ -63,6 +63,9 @@ inline static enum sip_protos get_proto(enum sip_protos force_proto,

                                case PROTO_UDP: /* transport specified explicitely */

 #ifdef USE_TCP

                                case PROTO_TCP:

+#endif

+#ifdef USE_TLS

+                               case PROTO_TLS:

 #endif

                                        return u->proto;

                                default:

@@ -73,6 +76,9 @@ inline static enum sip_protos get_proto(enum sip_protos force_proto,

                case PROTO_UDP: /* some protocol has been forced -- take it */

 #ifdef USE_TCP

                case PROTO_TCP:

+#endif

+#ifdef USE_TLS

+               case PROTO_TLS:

 #endif

                        return force_proto;

                default:

@@ -1174,6 +1174,8 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,

 							" id_builder failed\n");

 			goto error01; /* free everything */

 		}

+		DBG("build_req_from_req: id added: <%.*s>, rcv proto=%d\n",

+				id_len, id_buf, msg->rcv.proto);

 		extra_params.s=id_buf;

 		extra_params.len=id_len;

 	}

@@ -1183,6 +1185,8 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,

 			|| proto==PROTO_TLS

 #endif

 			){

+		DBG("build_req_from_req: checking for clen; proto=%d, rcv->proto=%d\n",

+				proto, msg->rcv.proto);

 		/* first of all parse content-length */

 		if (parse_headers(msg, HDR_CONTENTLENGTH, 0)==-1){

 			LOG(L_ERR, "build_req_buf_from_sip_req:"

@@ -1885,7 +1889,7 @@ char* via_builder( unsigned int *len,

 	}else if (proto==PROTO_TCP){

 		memcpy(line_buf+MY_VIA_LEN-4, "TCP ", 4);

 	}else if (proto==PROTO_TLS){

-		memcpy(line_buf+MY_VIA_LEN-4, "TLS", 4);

+		memcpy(line_buf+MY_VIA_LEN-4, "TLS ", 4);

 	}else{

 		LOG(L_CRIT, "BUG: via_builder: unknown proto %d\n", proto);

 		return 0;

@@ -43,6 +43,7 @@

  *  2003-02-28  scratchpad compatibility abandoned (jiri)

  *  2003-04-26  ZSW (jiri)

  *  2003-06-23  fixed  parse_via_param [op].* param. parsing bug (andrei)

+ *  2003-07-02  added support for TLS parsing in via (andrei)

  */

@@ -81,7 +82,8 @@ enum {

 	L_VER, F_VER,

 	VER1, VER2, FIN_VER,

 	UDP1, UDP2, FIN_UDP,

-	TCP1, TCP2, FIN_TCP,

+	TCP_TLS1, TCP2, FIN_TCP,

+	          TLS2, FIN_TLS,

 	L_PROTO, F_PROTO

 };

@@ -985,6 +987,12 @@ parse_again:

 						vb->proto=PROTO_TCP;

 						state=F_HOST; /* start looking for host*/

 						goto main_via;

+					case FIN_TLS:

+						/* finished proto parsing */

+						vb->transport.len=tmp-vb->transport.s;

+						vb->proto=PROTO_TLS;

+						state=F_HOST; /* start looking for host*/

+						goto main_via;

 					case FIN_SIP:

 						vb->name.len=tmp-vb->name.s;

 						state=L_VER;

@@ -1026,6 +1034,12 @@ parse_again:

 						state=F_LF;

 						saved_state=F_HOST; /* start looking for host*/

 						goto main_via;

+					case FIN_TLS:

+						vb->transport.len=tmp-vb->transport.s;

+						vb->proto=PROTO_TLS;

+						state=F_LF;

+						saved_state=F_HOST; /* start looking for host*/

+						goto main_via;

 					case FIN_SIP:

 						vb->name.len=tmp-vb->name.s;

 						state=F_LF;

@@ -1071,6 +1085,12 @@ parse_again:

 						state=F_CR;

 						saved_state=F_HOST;

 						goto main_via;

+					case FIN_TLS:

+						vb->transport.len=tmp-vb->transport.s;

+						vb->proto=PROTO_TLS;

+						state=F_CR;

+						saved_state=F_HOST;

+						goto main_via;

 					case FIN_SIP:

 						vb->name.len=tmp-vb->name.s;

 						state=F_CR;

@@ -1123,6 +1143,9 @@ parse_again:

 						state=SIP1;

 						vb->name.s=tmp;

 						break;

+					case TLS2:

+						state=FIN_TLS;

+						break;

 					default:

 						LOG(L_ERR, "ERROR: parse_via: bad char <%c> on"

 								" state %d\n", *tmp, state);

@@ -1189,7 +1212,7 @@ parse_again:

 			case 't':

 				switch(state){

 					case F_PROTO:

-						state=TCP1;

+						state=TCP_TLS1;

 						vb->transport.s=tmp;

 						break;

 					default:

@@ -1201,7 +1224,7 @@ parse_again:

 			case 'C':

 			case 'c':

 				switch(state){

-					case TCP1:

+					case TCP_TLS1:

 						state=TCP2;

 						break;

 					default:

@@ -1210,6 +1233,18 @@ parse_again:

 						goto error;

 				}

 				break;

+			case 'L':

+			case 'l':

+				switch(state){

+					case TCP_TLS1:

+						state=TLS2;

+						break;

+					default:

+						LOG(L_ERR, "ERROR: parse_via: bad char <%c> on"

+								" state %d\n", *tmp, state);

+						goto error;

+				}

+				break;

 			/*match 2.0*/

 			case '2':

 				switch(state){

@@ -497,6 +497,11 @@ struct hostent* sip_resolvehost(str* name, unsigned short* port, int proto)

 					memcpy(tmp+SRV_PREFIX_LEN, name->s, name->len);

 					tmp[SRV_PREFIX_LEN + name->len] = '\0';

 					break;

+				case PROTO_TLS:

+					memcpy(tmp, SRV_TLS_PREFIX, SRV_PREFIX_LEN);

+					memcpy(tmp+SRV_PREFIX_LEN, name->s, name->len);

+					tmp[SRV_PREFIX_LEN + name->len] = '\0';

+					break;

 				default:

 					LOG(L_CRIT, "BUG: sip_resolvehost: unknown proto %d\n",

 							proto);

@@ -158,6 +158,7 @@ static int fix_actions(struct action* a)

 	for(t=a; t!=0; t=t->next){

 		switch(t->type){

 			case FORWARD_T:

+			case FORWARD_TLS_T:

 			case FORWARD_TCP_T:

 			case FORWARD_UDP_T:

 			case SEND_T:

@@ -141,7 +141,6 @@ struct tcp_connection* tcpconn_new(int sock, union sockaddr_union* su,

 	c->refcnt=0;

 	su2ip_addr(&c->rcv.src_ip, su);

 	c->rcv.src_port=su_getport(su);

-	c->rcv.proto=PROTO_TCP;

 	c->rcv.bind_address=ba;

 	if (ba){

 		c->rcv.dst_ip=ba->address;

@@ -793,7 +792,7 @@ void tcp_main_loop()

 		/* start from 1, the "main" process does not transmit anything*/

 		for (r=1; r<process_no && n; r++){

 			if ( (pt[r].unix_sock>0) && FD_ISSET(pt[r].unix_sock, &sel_set)){

-				/* (we can't have a fd==0, 0 i s never closed )*/

+				/* (we can't have a fd==0, 0 is never closed )*/

 				n--;

 				/* errno==EINTR !!! TODO*/

 read_again:

@@ -399,14 +399,14 @@ int tcp_read_req(struct tcp_connection* con)

 #ifdef USE_TLS

 		if (con->type==PROTO_TLS){

 			if (con->state==S_CONN_ACCEPT){

-				if (tls_accept(con)!=0){

+				if (tls_accept(con, 0)!=0){

 					resp=CONN_ERROR;

 					goto end_req;

 				}

 				if(con->state!=S_CONN_OK) goto end_req; /* not enough data */

 			}

 			if(con->state==S_CONN_CONNECT){

-				if (tls_connect(con)!=0){

+				if (tls_connect(con, 0)!=0){

 					resp=CONN_ERROR;

 					goto end_req;

 				}

@@ -1,4 +1,4 @@

-INVITE sip:p2@195.37.78.126 SIP/2.0

+INVITE sip:p2@iptel.org SIP/2.0

 Via: SIP/2.0/UDP 192.168.99.100:5040

 From: "GMD FOKUS iptlab" <sip:jiri@iptel.org>;tag=b96b0300ed30f1286-2f5d

 Call-ID: b96b0300-88d30f-66da-63aa@195.37.78.190

@@ -9,7 +9,7 @@ User-Agent: Cisco-SIP-IP-Phone/2

 Accept: application/sdp

 Contact: sip:jiri@195.37.78.190:5060

 Content-Type: application/sdp

-Content-Length: 225

+Content-Length: 218

 v=0