Merge in latest local changes and improvements:

o Allow radius and presence modules to be turned off;

o don't override CFLAGS;

o don't duplicate error messages to the console;

o postgresql backend doesn't set NULL flag on results properly, so that
  don't use VAL_NULL() macros on them;

o reconnect to MySQL db when necessary;

o relax transaction matching rules, so that it works with wider range of
  phones;

o add some missed sanity checks in usrloc;

o ignore incoming UDP messages that are shorter than certain limin (128
  bytes). They cannot be SIP messages anyway.

1 files changed, 25 insertions, 0 deletions

diff --git a/net/ser/files/patch-parser::msg_parser.h b/net/ser/files/patch-parser::msg_parser.h
new file mode 100644
index 000000000000..aae77f66f6cb
--- /dev/null
+++ b/net/ser/files/patch-parser::msg_parser.h
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- parser/msg_parser.h.orig
++++ parser/msg_parser.h
+@@ -193,6 +193,7 @@
+ 	struct hdr_field* accept_disposition;
+ 	struct hdr_field* diversion;
+ 	struct hdr_field* rpid;
++	struct hdr_field* server;
+ 
+ 	char* eoh;        /* pointer to the end of header (if found) or null */
+ 	char* unparsed;   /* here we stopped parsing*/
+@@ -287,7 +288,11 @@
+ 	
+ 	/* topmost Via is part of transaction key as well ! */
+ 	src[5]= msg->via1->host;
++#if 0
+ 	src[6]= msg->via1->port_str;
++#else
++	src[6].len = 0;
++#endif
+ 	if (msg->via1->branch) {
+ 		src[7]= msg->via1->branch->value;
+ 		MDStringArray ( cv, src, 8 );