Changeset 1075:54d1cb00331a in freeDiameter

Timestamp:

May 2, 2013, 1:59:58 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Use float type to solve /0 issue

Location:

extensions

Files:

• app_diameap/diameap_eap.c (modified) (2 diffs)
• app_diameap/diameap_plugins.c (modified) (2 diffs)
• app_diameap/libdiameap.h (modified) (1 diff)
• dbg_monitor/dbg_monitor.c (modified) (1 diff)

extensions/app_diameap/diameap_eap.c

@@ -373 +373 @@
                 case EAP_INTEGRITY_CHECK:
                         if ((*eap_sm->selectedMethod->eap_method_check)(eap_sm,
-                                        eap_i->aaaEapRespData) == FALSE)
+                                        &eap_i->aaaEapRespData) == FALSE)
                         {
                                 TRACE_DEBUG(INFO,"%s[EAP Protocol] Invalid EAP packet received {Type=%d, Vendor=%d}. Integrity check failed (non fatal error).",DIAMEAP_EXTENSION,eap_sm->currentMethod,eap_sm->currentVendor);
@@ -434 +434 @@
                         }
                         if ((*eap_sm->selectedMethod->eap_method_process)(eap_sm,
-                                        eap_i->aaaEapRespData))
+                                        &eap_i->aaaEapRespData))
                         {
                                 TRACE_DEBUG(INFO,"%s[EAP Protocol] [%s plugin] Authentication process failed.",DIAMEAP_EXTENSION,eap_sm->selectedMethod->methodname);

extensions/app_diameap/diameap_plugins.c

@@ -263 +263 @@
                 {
                         plugin->eap_method_check = (boolean(*)(struct eap_state_machine *,
-                                        struct eap_packet)) dlsym(plugin->handler,
+                                        struct eap_packet*)) dlsym(plugin->handler,
                                         registerplugin->check);
                         if (plugin->eap_method_check == NULL)
@@ -285 +285 @@
                 {
                         plugin->eap_method_process = (int(*)(struct eap_state_machine *,
-                                        struct eap_packet)) dlsym(plugin->handler,
+                                        struct eap_packet*)) dlsym(plugin->handler,
                                         registerplugin->process);
                         if (plugin->eap_method_process == NULL)

extensions/app_diameap/libdiameap.h

@@ -110 +110 @@
         int (*eap_method_getTimeout)(struct eap_state_machine *smd, int * timeout); /* address of the eap_method_getTimeout method */
         boolean (*eap_method_check)(struct eap_state_machine *smd,
-                        struct eap_packet eapRespData); /* address of the eap_method_check method */
+                        struct eap_packet * eapRespData); /* address of the eap_method_check method */
         int (*eap_method_process)(struct eap_state_machine *smd,
-                        struct eap_packet eapRespData); /* address of the eap_method_process method */
+                        struct eap_packet * eapRespData); /* address of the eap_method_process method */
         boolean (*eap_method_isDone)(struct eap_state_machine *smd); /* address of the eap_method_isDone method */
         int (*eap_method_getKey)(struct eap_state_machine *smd, u8 ** msk,int *msklength, 

extensions/dbg_monitor/dbg_monitor.c

@@ -56 +56 @@
                         struct timespec * total, struct timespec * blocking, struct timespec * last)
 {
-        long long throughput = (total_count * 1000000000) / ((total->tv_sec * 1000000000) + total->tv_nsec);
+        long long ms = (total->tv_sec * 1000000) + (total->tv_nsec / 1000);
+        long double throughput = (long double)total_count * 1000000;
+        throughput /= ms;
         if (peer) {
-                TRACE_DEBUG(INFO, "'%s'@'%s': cur:%d/%d, h:%d, T:%lld in %ld.%06lds (%llditems/s), blocked:%ld.%06lds, last processing:%ld.%06lds",
+                TRACE_DEBUG(INFO, "'%s'@'%s': cur:%d/%d, h:%d, T:%lld in %ld.%06lds (%.2LFitems/s), blocked:%ld.%06lds, last processing:%ld.%06lds",
                         queue_desc, peer, current_count, limit_count, highest_count,
                         total_count, total->tv_sec, total->tv_nsec, throughput,
                         blocking->tv_sec, blocking->tv_nsec, last->tv_sec, last->tv_nsec);
         } else {
-                TRACE_DEBUG(INFO, "Global '%s': cur:%d/%d, h:%d, T:%lld in %ld.%06lds (%llditems/s), blocked:%ld.%06lds, last processing:%ld.%06lds",
+                TRACE_DEBUG(INFO, "Global '%s': cur:%d/%d, h:%d, T:%lld in %ld.%06lds (%.2LFitems/s), blocked:%ld.%06lds, last processing:%ld.%06lds",
                         queue_desc, current_count, limit_count, highest_count,
                         total_count, total->tv_sec, total->tv_nsec, throughput,