[sr-dev] git:master:3d58bdfc: core: removed ifdefs for WITH_XAVP

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 3d58bdfc699b5fbeac18536604a3cd8217eaef8c
URL: https://github.com/kamailio/kamailio/commit/3d58bdfc699b5fbeac18536604a3cd8217eaef8c

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2019-04-18T14:08:49+02:00

core: removed ifdefs for WITH_XAVP

- xavps are enabled for about 10 years and used extensively

---

Modified: src/core/receive.c
Modified: src/core/xavp.c
Modified: src/core/xavp.h

---

Diff:  https://github.com/kamailio/kamailio/commit/3d58bdfc699b5fbeac18536604a3cd8217eaef8c.diff
Patch: https://github.com/kamailio/kamailio/commit/3d58bdfc699b5fbeac18536604a3cd8217eaef8c.patch

---

diff --git a/src/core/receive.c b/src/core/receive.c
index dd9248c721..3a2919cec2 100644
--- a/src/core/receive.c
+++ b/src/core/receive.c
@@ -46,9 +46,7 @@
 #include "dset.h"
 #include "fmsg.h"
 #include "usr_avp.h"
-#ifdef WITH_XAVP
 #include "xavp.h"
-#endif
 #include "select_buf.h"
 
 #include "tcp_server.h"  /* for tcpconn_add_alias */
@@ -583,7 +581,5 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info)
 void ksr_msg_env_reset(void)
 {
 	reset_avps();
-#ifdef WITH_XAVP
 	xavp_reset_list();
-#endif
 }
diff --git a/src/core/xavp.c b/src/core/xavp.c
index be3bba423f..f9b0fd627f 100644
--- a/src/core/xavp.c
+++ b/src/core/xavp.c
@@ -20,8 +20,6 @@
  * Module: \ref core
  */
 
-#ifdef WITH_XAVP
-
 #include <stdio.h>
 #include <string.h>
 
@@ -1041,4 +1039,3 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen)
 	}
 	return rlen;
 }
-#endif
diff --git a/src/core/xavp.h b/src/core/xavp.h
index 4cd333eaaf..4f440ea612 100644
--- a/src/core/xavp.h
+++ b/src/core/xavp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) 
+ * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com)
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,8 +18,6 @@
 #ifndef _SR_XAVP_H_
 #define _SR_XAVP_H_
 
-#ifdef WITH_XAVP
-
 #include <time.h>
 #include "str.h"
 #include "str_list.h"
@@ -111,6 +109,5 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen);
 
 int xavp_set_child_ival(str *rname, str *cname, int ival);
 int xavp_set_child_sval(str *rname, str *cname, str *sval);
-#endif
 
 #endif