Changeset 18920 for trunk/FACT++/dim/src/discpp.cxx

Timestamp:

10/18/17 13:54:41 (7 years ago)

Author:

tbretz

Message:

Updated to v20r20 - This also includes some minor fixes, I requested.

File:

• trunk/FACT++/dim/src/discpp.cxx (modified) (7 diffs)

trunk/FACT++/dim/src/discpp.cxx

@@ -18 +18 @@
 extern "C" {
 extern void dis_init();
+extern int do_dis_remove_service(unsigned service_id, int do_stop_serving, void **dnsp );
+extern void do_dis_stop_serving_dns(void *dnsp);
 
 static void user_routine( void *tagp, void **buf, int *size, int *first_time)
@@ -1001 +1003 @@
 DimService::~DimService()
 {
+        int ret = 0;
+        void *dnsp;
+
         DISABLE_AST
         if(itsName)
@@ -1009 +1014 @@
 //              id_free(itsTagId, SRC_DIS);
         if(itsId)
-                dis_remove_service( itsId );
+                ret = do_dis_remove_service( itsId, 0, &dnsp );
         itsId = 0;
         ENABLE_AST
+        if(ret == -1)
+        {
+                do_dis_stop_serving_dns(dnsp);
+        }
 }
 
@@ -1487 +1496 @@
 DimCommand::~DimCommand()
 {
+        int ret;
+        void *dnsp;
+
         DISABLE_AST
         delete[] itsName;
@@ -1493 +1505 @@
 //              id_free(itsTagId, SRC_DIS);
         if(itsId)
-                dis_remove_service( itsId );
+                ret = do_dis_remove_service( itsId, 0, &dnsp );
         itsId = 0;
         ENABLE_AST
+        if(ret == -1)
+        {
+                do_dis_stop_serving_dns(dnsp);
+        }
 }
 
@@ -1514 +1530 @@
 DimRpc::~DimRpc()
 {
+        int ret;
+        void *dnsp;
+
         DISABLE_AST
         delete[] itsName;
@@ -1521 +1540 @@
 //              id_free(itsTagId, SRC_DIS);
         if(itsIdIn)
-                dis_remove_service( itsIdIn );
+                ret = do_dis_remove_service( itsIdIn, 0, &dnsp );
         if(itsIdOut)
-                dis_remove_service( itsIdOut );
+                ret = do_dis_remove_service( itsIdOut, 0, &dnsp );
         itsIdIn = 0;
         itsIdOut = 0;
         ENABLE_AST
+        if(ret == -1)
+        {
+                do_dis_stop_serving_dns(dnsp);
+        }
 }