Changes in / [1113:eb4ce68b6e5c:1116:5da2ea1585a1] in freeDiameter

Files:

• contrib/tools/org_to_fd.pl (modified) (1 diff)
• extensions/rt_busypeers/rtbusy.c (modified) (1 diff)

contrib/tools/org_to_fd.pl

@@ -53 +53 @@
 
 sub usage($) {
-    die("usage: org_to_fd.pl [-V vendor_name -v vendor] [file ...]\n");
+    die("usage: org_to_fd.pl [-V vendor_name -v vendor_code] [file ...]\n");
     exit(@_);
 }

extensions/rt_busypeers/rtbusy.c

@@ -107 +107 @@
                 /* Send the query again. We  need to re-associate the expirecb which was cleaned, if it is used */
                 if (rtbusy_conf.RelayTimeout) {
-                        struct timespec tm = { .tv_sec = rtbusy_conf.RelayTimeout/1000, .tv_nsec=1000000LL * (rtbusy_conf.RelayTimeout % 1000) };
-                        CHECK_FCT( fd_msg_send_timeout( pmsg, NULL, NULL, rtbusy_expirecb, &tm ) );
+                        struct timespec expire;
+                        CHECK_SYS(  clock_gettime(CLOCK_REALTIME, &expire)  );
+                        expire.tv_sec += rtbusy_conf.RelayTimeout/1000 + ((expire.tv_nsec + (1000000LL * (rtbusy_conf.RelayTimeout % 1000))) / 1000000000LL);
+                        expire.tv_nsec = (expire.tv_nsec + (1000000LL * (rtbusy_conf.RelayTimeout % 1000))) % 1000000000LL;
+                        CHECK_FCT( fd_msg_send_timeout( pmsg, NULL, NULL, rtbusy_expirecb, &expire ) );
                 } else {
                         CHECK_FCT( fd_msg_send(pmsg, NULL, NULL) );