Changes in include/freeDiameter/libfdproto.h [1281:ab6457399be2:1304:5a505af0bba0] in freeDiameter

File:

• include/freeDiameter/libfdproto.h (modified) (6 diffs)

include/freeDiameter/libfdproto.h

@@ -110 +110 @@
 
 #define DIAMETER_PORT           3868
-#define DIAMETER_SECURE_PORT    5658
+#define DIAMETER_SECURE_PORT    5868
 
 
@@ -290 +290 @@
 #endif /* __PRETTY_FUNCTION__ */
 
-/* A version of __FILE__ without the full path */
+/* A version of __FILE__ without the full path. This is specific to each C file being compiled */
 static char * file_bname = NULL;
 static char * file_bname_init(char * full) { file_bname = basename(full); return file_bname; }
@@ -298 +298 @@
 
 /* In DEBUG mode, we add meta-information along each trace. This makes multi-threading problems easier to debug. */
-#if (defined(DEBUG) && !defined(DEBUG_WITHOUT_META))
+#if (defined(DEBUG) && defined(DEBUG_WITH_META))
 # define STD_TRACE_FMT_STRING "pid:%s in %s@%s:%d: "
 # define STD_TRACE_FMT_ARGS   , ((char *)pthread_getspecific(fd_log_thname) ?: "unnamed"), __PRETTY_FUNCTION__, __STRIPPED_FILE__, __LINE__
-#else /* DEBUG && !DEBUG_WITHOUT_META */
+#else /* DEBUG && DEBUG_WITH_META */
 # define STD_TRACE_FMT_STRING ""
 # define STD_TRACE_FMT_ARGS
-#endif /* DEBUG && !DEBUG_WITHOUT_META */
+#endif /* DEBUG && DEBUG_WITH_META */
 
 /*************************
@@ -1259 +1259 @@
 typedef int (*dict_avpdata_encode) (void * data, union avp_value * val);
 
+/*
+ * CALLBACK:    dict_avpdata_check
+ *
+ * PARAMETERS:
+ *   val        : Pointer to the AVP value that was received and needs to be sanity checked.
+ *   data      : a parameter stored in the type structure (to enable more generic check functions)
+ *   error_msg: upon erroneous value, a string describing the error can be returned here (it will be strcpy by caller). This description will be returned in the error message, if any. 
+ *
+ * DESCRIPTION: 
+ *   This callback can be provided with a derived type in order to improve the operation of the
+ *  fd_msg_parse_dict function. When this callback is present, the value of the AVP that has
+ * been parsed is passed to this function for finer granularity check. For example for some 
+ * speccific AVP, the format of an OCTETSTRING value can be further checked, or the
+ * interger value can be verified.
+ *
+ * RETURN VALUE:
+ *  0           : The value is valid.
+ *  !0          : An error occurred, the error code is returned. It is advised to return EINVAL on incorrect val
+ */
+typedef int (*dict_avpdata_check) (void * data, union avp_value * val, char ** error_msg);
+
+
 
 /* Type to hold data associated to a derived AVP data type */
@@ -1267 +1289 @@
         dict_avpdata_encode      type_encode;   /* cb to convert formatted data into an AVP value (or NULL) */
         DECLARE_FD_DUMP_PROTOTYPE((*type_dump), union avp_value * val); /* cb called by fd_msg_dump_* for this type of data (if != NULL). Returned string must be freed.  */
+        dict_avpdata_check       type_check;
+        void  *                          type_check_param;
 };
 
@@ -1293 +1317 @@
 DECLARE_FD_DUMP_PROTOTYPE(fd_dictfct_Time_dump, union avp_value * avp_value);
 
+
+/* For string AVP, the following type_check function provides simple basic check for specific characters presence, e.g. use "@." for trivial email address check */
+int fd_dictfct_CharInOS_check(void * data, union avp_value * val, char ** error_msg);