Merge branch 'ser_core_cvs'
authorJan Janak <jan@iptel.org>
Fri, 27 Feb 2009 22:27:37 +0000 (23:27 +0100)
committerJan Janak <jan@iptel.org>
Fri, 27 Feb 2009 22:27:37 +0000 (23:27 +0100)
* ser_core_cvs:
  sctp: direct blacklist support
  Support for MESSAGE and OPTIONS method types are added to the parser.
  log/dbg: level is not limited anymore
  config: tcp_async alias for tcp_buf_write
  tcp: async write timeout fixes
  tcp: blacklist at tcp level if possible
  blst: another blacklist dest. function version
  cfg_size macro renamed to cfg_sizeof to avoid a conflict with one of the

Conflicts:

cfg.y

The first conflict in BREAK definition, the file coming from cvs contained
RETURN_R_F, while the file coming from git contained BREAK_R_F, I resolved it
with BREAK_R_F.

The second conflict was in the definition in LOG_TOK which was resolved with
the latest version from cvs.

1  2 
NEWS
cfg.lex
cfg.y
dprint.h

diff --cc NEWS
Simple merge
diff --cc cfg.lex
Simple merge
diff --cc cfg.y
--- 1/cfg.y
--- 2/cfg.y
+++ b/cfg.y
@@@ -2462,8 -2206,9 +2462,9 @@@ cmd
        | RETURN                        {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)1, NUMBER_ST, (void*)RETURN_R_F); }
        | RETURN NUMBER                 {$$=mk_action(DROP_T, 2, NUMBER_ST, (void*)$2, NUMBER_ST, (void*)RETURN_R_F);}
        | RETURN RETCODE                {$$=mk_action(DROP_T, 2, RETCODE_ST, 0, NUMBER_ST, (void*)RETURN_R_F);}
 -      | BREAK                         {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)RETURN_R_F); }
 +      | BREAK                         {$$=mk_action(DROP_T, 2, NUMBER_ST, 0, NUMBER_ST, (void*)BREAK_R_F); }
-       | LOG_TOK LPAREN STRING RPAREN  {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)4, STRING_ST, $3); }
+       | LOG_TOK LPAREN STRING RPAREN  {$$=mk_action(LOG_T, 2, NUMBER_ST,
+                                                                               (void*)(L_DBG+1), STRING_ST, $3); }
        | LOG_TOK LPAREN NUMBER COMMA STRING RPAREN     {$$=mk_action(LOG_T, 2, NUMBER_ST, (void*)$3, STRING_ST, $5); }
        | LOG_TOK error                 { $$=0; yyerror("missing '(' or ')' ?"); }
        | LOG_TOK LPAREN error RPAREN   { $$=0; yyerror("bad log argument"); }
diff --cc dprint.h
Simple merge