Bladeren bron

- integrate definitions from md5global.h into md5.h/ md5.c after cleanups
- remove inclusion of this file from uac and auth module
- extend test 12 with variable assignment and md5/ string transformations
- small formatting fix for the copyright headers
- todo: remove this PROTO_LIST stuff, this mask some warnings, remove this
custom mem routines that are not used because of USE_MEM define in md5.c


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4897 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt 17 jaren geleden
bovenliggende
commit
91d939f4a8
2 gewijzigde bestanden met toevoegingen van 11 en 5 verwijderingen
  1. 3 1
      test/unit/12.cfg
  2. 8 4
      test/unit/12.sh

+ 3 - 1
test/unit/12.cfg

@@ -18,13 +18,15 @@ avp_aliases="identity_domain=i:82"
 avp_aliases="identity_uri=i:83"
 
 route{
-	xlog("received by kamailio[$pp] at '$Tf' from $si:$sp, method: $rm, transport: $rP:$Ri:$rp, user agent: $ua\n");
+	xlog("received by kamailio[$pp] at '$Tf' from $si:$sp, method: $(rm{s.tolower}), transport: $rP:$Ri:$rp, user agent: $ua\n");
 
 	if !(route(39)) {
 		xlog("L_ERR", "Error getting identity\n");
 		exit;
 	}
 	xlog("L_ERR", "My identity: $avp(identity_uri)\n");
+	$var(x) = "sip:" + $fU +"@" + $td;
+	xlog("var(x): $var(x), MD5 var(x): $(var(x){s.md5})\n");
 
 	if (!method=="REGISTER")
 		record_route();

+ 8 - 4
test/unit/12.sh

@@ -58,7 +58,7 @@ if [ "$ret" -eq 0 ] ; then
 fi ;
 
 if [ "$ret" -eq 0 ] ; then
-	grep "method: REGISTER, transport: UDP:127.0.0.1:5060, user agent: Twinkle/1.0"  $TMPFILE > /dev/null
+	grep "method: register, transport: UDP:127.0.0.1:5060, user agent: Twinkle/1.0"  $TMPFILE > /dev/null
 	ret=$?
 	if [ "$ret" -eq 0 ] ; then
 		grep "Getting identity from FROM URI" $TMPFILE > /dev/null
@@ -67,14 +67,18 @@ if [ "$ret" -eq 0 ] ; then
 			grep "My identity: sip:[email protected]" $TMPFILE > /dev/null
 			ret=$?
 			if [ "$ret" -eq 0 ] ; then
-				grep "Contact header field present" $TMPFILE > /dev/null
+				grep "var(x): sip:[email protected], MD5 var(x): b6c3d120cfd9e85addf64ee8943f4eec" $TMPFILE > /dev/null
 				ret=$?
 				if [ "$ret" -eq 0 ] ; then
-					grep "this is an registration" $TMPFILE > /dev/null
+					grep "Contact header field present" $TMPFILE > /dev/null
 					ret=$?
 					if [ "$ret" -eq 0 ] ; then
-						grep "this is an unregistration" $TMPFILE > /dev/null
+						grep "this is an registration" $TMPFILE > /dev/null
 						ret=$?
+						if [ "$ret" -eq 0 ] ; then
+							grep "this is an unregistration" $TMPFILE > /dev/null
+							ret=$?
+						fi;
 					fi ;
 				fi ;
 			fi ;