Browse code

core/tcp: use term from MSRP spec to name the variable

Daniel-Constantin Mierla authored on 14/01/2012 21:12:58
Showing 1 changed files
... ...
@@ -381,7 +381,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags)
381 381
 
382 382
 #ifdef READ_MSRP
383 383
 	char *mfline;
384
-	str msessid;
384
+	str mtransid;
385 385
 #endif
386 386
 
387 387
 	#define crlf_default_skip_case \
... ...
@@ -944,23 +944,23 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags)
944 944
 						r->state=H_MSRP_BODY;
945 945
 						break;
946 946
 					}
947
-					/* locate session id in first line
947
+					/* locate transaction id in first line
948 948
 					 * -- first line exists, that's why we are here */
949 949
 					mfline =  q_memchr(r->start, '\n', r->pos-r->start);
950
-					msessid.s = q_memchr(r->start + 5 /* 'MSRP ' */, ' ',
950
+					mtransid.s = q_memchr(r->start + 5 /* 'MSRP ' */, ' ',
951 951
 							mfline - r->start);
952
-					msessid.len = msessid.s - r->start - 5;
953
-					msessid.s = r->start + 5;
954
-					trim(&msessid);
955
-					if(memcmp(msessid.s,
956
-							p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - msessid.len,
957
-							msessid.len)!=0) {
952
+					mtransid.len = mtransid.s - r->start - 5;
953
+					mtransid.s = r->start + 5;
954
+					trim(&mtransid);
955
+					if(memcmp(mtransid.s,
956
+							p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - mtransid.len,
957
+							mtransid.len)!=0) {
958 958
 						/* no match on session id - not end-line */
959 959
 						p++;
960 960
 						r->state=H_MSRP_BODY;
961 961
 						break;
962 962
 					}
963
-					if(memcmp(p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - msessid.len
963
+					if(memcmp(p - 1 /*\r*/ - 1 /* '+'|'#'|'$' */ - mtransid.len
964 964
 								- 7 /* 7 x '-' */ - 1 /* '\n' */, "\n-------",
965 965
 								8)!=0) {
966 966
 						/* no match on "\n-------" - not end-line */