@@ -33,6 +33,7 @@

  *              replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)

  *  2003-04-01  Added support for loose routing in forward (janakj)

  *  2003-04-12  FORCE_RPORT_T added (andrei)

+ *  2003-04-22  strip_tail added (jiri)

  */

@@ -376,8 +377,9 @@ int do_action(struct action* a, struct sip_msg* msg)

 		case SET_URI_T:

 		case PREFIX_T:

 		case STRIP_T:

+		case STRIP_TAIL_T:

 				user=0;

-				if (a->type==STRIP_T) {

+				if (a->type==STRIP_T || a->type==STRIP_TAIL_T) {

 					if (a->p1_type!=NUMBER_ST) {

 						LOG(L_CRIT, "BUG: do_action: bad set*() type %d\n",

 							a->p1_type);

@@ -464,6 +466,18 @@ int do_action(struct action* a, struct sip_msg* msg)

 						tmp=uri.user.s + a->p1.number;

 						len=uri.user.len - a->p1.number;

 					}

+				} else if (a->type==STRIP_TAIL_T) {

+					if (a->p1.number>uri.user.len) {

+						LOG(L_WARN, "WARNING: too long strip_tail asked; "

+									" deleting username: %d of <%.*s>\n",

+									a->p1.number, uri.user.len, uri.user.s );

+						len=0;

+					} else if (a->p1.number==uri.user.len) {

+						len=0;

+					} else {

+						tmp=uri.user.s;

+						len=uri.user.len - a->p1.number;

+					}

 				} else {

 					tmp=uri.user.s;

 					len=uri.user.len;

@@ -34,6 +34,7 @@

  *  2003-04-01  added dst_port, proto (tcp, udp, tls), af(inet, inet6) (andrei)

  *  2003-04-05  s/reply_route/failure_route, onreply_route introduced (jiri)

  *  2003-04-12  added force_rport, chdir and wdir (andrei)

+ *  2003-04-22  strip_tail added (jiri)

  */

@@ -97,6 +98,7 @@ SET_URI			"rewriteuri"|"seturi"

 REVERT_URI		"revert_uri"

 PREFIX			"prefix"

 STRIP			"strip"

+STRIP_TAIL		"strip_tail"

 APPEND_BRANCH	"append_branch"

 IF				"if"

 ELSE			"else"

@@ -232,6 +234,7 @@ EAT_ABLE	[\ \t\b\r]

 <INITIAL>{REVERT_URI}	{ count(); yylval.strval=yytext; return REVERT_URI; }

 <INITIAL>{PREFIX}	{ count(); yylval.strval=yytext; return PREFIX; }

 <INITIAL>{STRIP}	{ count(); yylval.strval=yytext; return STRIP; }

+<INITIAL>{STRIP_TAIL}	{ count(); yylval.strval=yytext; return STRIP_TAIL; }

 <INITIAL>{APPEND_BRANCH}	{ count(); yylval.strval=yytext; 

 								return APPEND_BRANCH; }

 <INITIAL>{FORCE_RPORT}	{ count(); yylval.strval=yytext; return FORCE_RPORT; }

@@ -38,6 +38,7 @@

  * 2003-04-05  s/reply_route/failure_route, onreply_route introduced (jiri)

  * 2003-04-12  added force_rport, chroot and wdir (andrei)

  * 2003-04-15  added tcp_children, disable_tcp (andrei)

+ * 2003-04-22  strip_tail added (jiri)

  */

@@ -116,6 +117,7 @@ int rt;  /* Type of route block for find_export */

 %token SET_HOSTPORT

 %token PREFIX

 %token STRIP

+%token STRIP_TAIL

 %token APPEND_BRANCH

 %token SET_USER

 %token SET_USERPASS

@@ -1056,6 +1058,12 @@ cmd:		FORWARD LPAREN host RPAREN	{ $$=mk_action(	FORWARD_T,

 		| PREFIX error { $$=0; yyerror("missing '(' or ')' ?"); }

 		| PREFIX LPAREN error RPAREN { $$=0; yyerror("bad argument, "

 														"string expected"); }

+		| STRIP_TAIL LPAREN NUMBER RPAREN { $$=mk_action(STRIP_TAIL_T, 

+									NUMBER_ST, 0, (void *) $3, 0); }

+		| STRIP_TAIL error { $$=0; yyerror("missing '(' or ')' ?"); }

+		| STRIP_TAIL LPAREN error RPAREN { $$=0; yyerror("bad argument, "

+														"number expected"); }

+

 		| STRIP LPAREN NUMBER RPAREN { $$=mk_action(STRIP_T, NUMBER_ST,

 														0, (void *) $3, 0); }

 		| STRIP error { $$=0; yyerror("missing '(' or ')' ?"); }

@@ -29,6 +29,7 @@

  * --------

  *

  *  2003-04-12  FORCE_RPORT_T added (andrei)

+ *  2003-04-22  strip_tail added (jiri)

  */

@@ -58,7 +59,7 @@ enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T,

 		SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, 

 		SET_PORT_T, SET_URI_T, IF_T, MODULE_T,

 		SETFLAG_T, RESETFLAG_T, ISFLAGSET_T ,

-		LEN_GT_T, PREFIX_T, STRIP_T,

+		LEN_GT_T, PREFIX_T, STRIP_T,STRIP_TAIL_T,

 		APPEND_BRANCH_T,

 		REVERT_URI_T,

 		FORWARD_TCP_T,