瀏覽代碼

modules/msrp: Use "msrps://" instead of "msrp://" in headers when the transport is WSS

Peter Dunkley 12 年之前
父節點
當前提交
ad11cdca09
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      modules/msrp/msrp_cmap.c
  2. 1 1
      modules/msrp/msrp_vars.c

+ 2 - 2
modules/msrp/msrp_cmap.c

@@ -211,7 +211,7 @@ int msrp_cmap_save(msrp_frame_t *mf)
 	idx = msrp_get_slot(hid, _msrp_cmap_head->mapsize);
 
 	srcaddr.s = sbuf;;
-	if(mf->tcpinfo->rcv->proto==PROTO_TLS)
+	if(mf->tcpinfo->rcv->proto==PROTO_TLS || mf->tcpinfo->rcv->proto==PROTO_WSS)
 	{
 		memcpy(srcaddr.s, "msrps://", 8);
 		srcaddr.s+=8;
@@ -295,7 +295,7 @@ int msrp_cmap_save(msrp_frame_t *mf)
 	_msrp_cmap_head->cslots[idx].lsize++;
 	lock_release(&_msrp_cmap_head->cslots[idx].lock);
 
-	if(mf->tcpinfo->rcv->proto==PROTO_TLS)
+	if(mf->tcpinfo->rcv->proto==PROTO_TLS || mf->tcpinfo->rcv->proto==PROTO_WSS)
 	{
 		srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE,
 				"Use-Path: msrps://%.*s/%.*s;tcp\r\nExpires: %d\r\n",

+ 1 - 1
modules/msrp/msrp_vars.c

@@ -273,7 +273,7 @@ int pv_get_msrp(sip_msg_t *msg,  pv_param_t *param, pv_value_t *res)
 				return pv_get_null(msg, param, res);
 			s.s = pv_get_buffer();
 			p = s.s;
-			if(mf->tcpinfo->rcv->proto==PROTO_TLS)
+			if(mf->tcpinfo->rcv->proto==PROTO_TLS || mf->tcpinfo->rcv->proto==PROTO_WSS)
 			{
 				memcpy(p, "msrps://", 8);
 				p+=8;