[SR-Dev] git:master: Merge branch 'ser_core_cvs'

[Jan Janak]

Module: sip-router
Branch: master
Commit: 7a0489e835789292fbe133b2000bc4091db87e5b
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a0489e835789292fbe133b2000bc4091db87e5b

Author: Jan Janak <jan at iptel.org>
Committer: Jan Janak <jan at iptel.org>
Date:   Fri Feb 27 23:27:37 2009 +0100

Merge branch 'ser_core_cvs'

* 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.

---