Changeset 14286 for trunk/FACT++/dim/src/dns.c

Timestamp:

07/25/12 17:22:52 (12 years ago)

Author:

tbretz

Message:

Updated to v19r37

File:

• trunk/FACT++/dim/src/dns.c (modified) (4 diffs)

trunk/FACT++/dim/src/dns.c

@@ -525 +525 @@
                                 {
                                         strncpy(Dns_conns[conn_id].long_task_name, packet->services[i].service_name,
-                                                MAX_TASK_NAME*2);
+                                                MAX_TASK_NAME*10);
                                         ptrt = strstr(Dns_conns[conn_id].long_task_name,"/CLIENT_LIST");
                                         *ptrt = '\0';
@@ -1455 +1455 @@
         dis_add_cmnd( "DIS_DNS/DEBUG_ON", 0, set_debug_on, 0 );
         dis_add_cmnd( "DIS_DNS/DEBUG_OFF", 0, set_debug_off, 0 );
-        dis_add_cmnd( "DIS_DNS/KILL_SERVERS", 0, kill_servers, 0 );
+        dis_add_cmnd( "DIS_DNS/KILL_SERVERS", "I", kill_servers, 0 );
         dis_add_cmnd( "DIS_DNS/PRINT_HASH_TABLE", 0, print_hash_table, 0 );
         dis_add_cmnd( "DIS_DNS/SERVICE_INFO/RpcIn", "C", set_rpc_info, 0 );
@@ -1563 +1563 @@
 
 
-void kill_servers()
+void kill_servers(int *tag, int *code, int *size)
 {
         int i;
         DNS_DIS_PACKET dis_packet;
-
+        int soft_code = 0, soft_size = 0;
+        int type;
+        
+        if(size)
+        {
+                soft_size = *size;
+                if(code)
+                {
+                        soft_code = *code;
+                }
+        }
         for(i = 0; i< Curr_N_Conns; i++)
         {
@@ -1574 +1584 @@
                         if(!strcmp(Dns_conns[i].task_name,"DIS_DNS"))
                                 continue;
-                        dim_print_date_time();
-                        printf(" Killing server %s@%s\n",
-                                Dns_conns[i].task_name, Dns_conns[i].node_name);
                         fflush(stdout);
-                        dis_packet.type = htovl(DNS_DIS_EXIT);
+                        type = DNS_DIS_EXIT;
+                        if(soft_size)
+                        {
+                                type = DNS_DIS_SOFT_EXIT;
+                                type |= (soft_code << 16) & 0xFFFF0000;
+                                dim_print_date_time();
+                                printf(" Killing server %s@%s with exit code %d\n",
+                                        Dns_conns[i].task_name, Dns_conns[i].node_name, soft_code);
+                        }
+                        else
+                        {
+                                dim_print_date_time();
+                                printf(" Killing server %s@%s\n",
+                                        Dns_conns[i].task_name, Dns_conns[i].node_name);
+                        }
+                        dis_packet.type = htovl(type);
                         dis_packet.size = htovl(DNS_DIS_HEADER);
                         if( !dna_write_nowait(i, &dis_packet, DNS_DIS_HEADER) )