Changeset 1387:d70f5f6cb306 in freeDiameter for extensions/rt_ereg/rtereg.c

Timestamp:

Oct 15, 2019, 11:25:47 PM (5 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

rt_ereg: improve logging and locking

File:

• extensions/rt_ereg/rtereg.c (modified) (11 diffs)

extensions/rt_ereg/rtereg.c

@@ -94 +94 @@
                 struct fd_list * c;
 
-                TRACE_DEBUG(ANNOYING, "Attempt pattern matching of '%.*s' with rule '%s'", (int)len, value, r->pattern);
+                LOG_D("[rt_ereg] attempting pattern matching of '%.*s' with rule '%s'", (int)len, value, r->pattern);
 
                 #ifdef HAVE_REG_STARTEND
@@ -119 +119 @@
 
                         /* Error while compiling the regex */
-                        TRACE_DEBUG(INFO, "Error while executing the regular expression '%s':", r->pattern);
+                        LOG_E("[rt_ereg] error while executing the regular expression '%s':", r->pattern);
 
                         /* Get the error message size */
@@ -129 +129 @@
                         /* Get the error message content */
                         regerror(err, &r->preg, errstr, bl);
-                        TRACE_DEBUG(INFO, "\t%s", errstr);
+                        LOG_E("\t%s", errstr);
 
                         /* Free the buffer, return the error */
@@ -138 +138 @@
 
                 /* From this point, the expression matched the AVP value */
-                TRACE_DEBUG(FULL, "[rt_ereg] Match: '%s' to value '%.*s' => '%s' += %d",
-                                        r->pattern,
-                                        (int)len,
-                                        value,
-                                        r->server,
-                                        r->score);
+                LOG_D("[rt_ereg] Match: '%s' to value '%.*s' => '%s' += %d", r->pattern, (int)len, value, r->server, r->score);
 
                 for (c = candidates->next; c != candidates; c = c->next) {
@@ -168 +163 @@
 //      for (i = 0; i<rtereg_conf[j].level; i++) {
         if (level > rtereg_conf[conf_index].level) {
-                TRACE_DEBUG(INFO, "internal error, dug too deep");
+                LOG_E("internal error, dug too deep");
                 return 1;
         }
@@ -179 +174 @@
                 if ((avp_hdr->avp_code == dictdata.avp_code) && (avp_hdr->avp_vendor == dictdata.avp_vendor)) {
                         if (level != rtereg_conf[conf_index].level - 1) {
-                                TRACE_DEBUG(INFO, "[rt_ereg] found grouped AVP %d (vendor %d), digging deeper", avp_hdr->avp_code, avp_hdr->avp_vendor);
+                                LOG_D("[rt_ereg] found grouped AVP %d (vendor %d), digging deeper", avp_hdr->avp_code, avp_hdr->avp_vendor);
                                 CHECK_FCT(find_avp(nextavp, conf_index, level+1, candidates));
                         } else {
-                                TRACE_DEBUG(INFO, "[rt_ereg] found AVP %d (vendor %d)", avp_hdr->avp_code, avp_hdr->avp_vendor);
+                                struct dictionary * dict;
+                                LOG_D("[rt_ereg] found AVP %d (vendor %d)", avp_hdr->avp_code, avp_hdr->avp_vendor);
+                                CHECK_FCT(fd_dict_getdict(what, &dict));
+                                CHECK_FCT_DO(fd_msg_parse_dict(nextavp, dict, NULL), /* nothing */);
                                 if (avp_hdr->avp_value != NULL) {
+                                        LOG_A("avp_hdr->avp_value NOT NULL, matching");
 #ifndef HAVE_REG_STARTEND
                                         int ret;
@@ -224 +223 @@
         int j, ret;
 
-        TRACE_ENTRY("%p %p %p", cbdata, *pmsg, candidates);
+        LOG_A("[rt_ereg] rtereg_out arguments: %p %p %p", cbdata, *pmsg, candidates);
 
         CHECK_PARAMS(pmsg && *pmsg && candidates);
@@ -239 +238 @@
                 for (j=0; j<rtereg_conf_size; j++) {
                         where = *pmsg;
-                        TRACE_DEBUG(INFO, "[rt_ereg] iterating over AVP group %d", j);
+                        LOG_D("[rt_ereg] iterating over AVP group %d", j);
                         if ((ret=find_avp(where, j, 0, candidates)) != 0) {
                                 break;
@@ -302 +301 @@
 static int rtereg_entry(char * conffile)
 {
-        TRACE_ENTRY("%p", conffile);
+        LOG_A("[rt_ereg] started with conffile '%p'", conffile);
 
         rt_ereg_config_file = conffile;
 
         if (rtereg_init() != 0) {
-            return 1;
+                return 1;
         }
 
@@ -322 +321 @@
         /* Initialize the configuration */
         if ((rtereg_conf=malloc(sizeof(*rtereg_conf))) == NULL) {
-            TRACE_DEBUG(INFO, "malloc failured");
-            return 1;
+                LOG_E("[rt_ereg] malloc failured");
+                return 1;
         }
         rtereg_conf_size = 1;
@@ -367 +366 @@
 static void rtereg_fini(void)
 {
-        TRACE_ENTRY();
-
         /* Unregister the cb */
         CHECK_FCT_DO( fd_rt_out_unregister ( rtereg_hdl, NULL ), /* continue */ );
 
+#ifndef HAVE_REG_STARTEND
+        free(buf);
+        buf = NULL;
+#endif /* HAVE_REG_STARTEND */
+
+        if (pthread_rwlock_wrlock(&rte_lock) != 0) {
+                fd_log_error("%s: write-locking failed in fini, giving up", MODULE_NAME);
+                return;
+        }
         /* Destroy the data */
         rtereg_conf_free(rtereg_conf, rtereg_conf_size);
         rtereg_conf = NULL;
         rtereg_conf_size = 0;
-#ifndef HAVE_REG_STARTEND
-        free(buf);
-        buf = NULL;
-#endif /* HAVE_REG_STARTEND */
+
+        if (pthread_rwlock_unlock(&rte_lock) != 0) {
+                fd_log_error("%s: write-unlocking failed in fini", MODULE_NAME);
+                return;
+        }
 
         /* Done */