Changeset 15282 for trunk/FACT++/dim/src/dis.c
- Timestamp:
- 04/08/13 15:07:07 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/dim/src/dis.c
r14575 r15282 201 201 if(Dis_packet_size) 202 202 free(Dis_packet); 203 Dis_packet = (DIS_STAMPED_PACKET *)malloc( DIS_STAMPED_HEADER + size);203 Dis_packet = (DIS_STAMPED_PACKET *)malloc((size_t)(DIS_STAMPED_HEADER + size)); 204 204 if(Dis_packet) 205 205 { … … 213 213 static int check_service_name(char *name) 214 214 { 215 if( strlen(name) > (MAX_NAME - 1))215 if((int)strlen(name) > (MAX_NAME - 1)) 216 216 return(0); 217 217 return(1); 218 218 } 219 219 220 staticvoid dis_init()220 void dis_init() 221 221 { 222 222 int dis_hash_service_init(); … … 266 266 } 267 267 new_serv = (SERVICE *)malloc( sizeof(SERVICE) ); 268 strncpy( new_serv->name, name, MAX_NAME );268 strncpy( new_serv->name, name, (size_t)MAX_NAME ); 269 269 if(type != (char *)0) 270 270 { 271 if ( strlen(type) >= MAX_NAME)271 if ((int)strlen(type) >= MAX_NAME) 272 272 { 273 273 strcpy(str,"Format String Too Long: "); … … 441 441 } 442 442 new_serv = (SERVICE *)malloc(sizeof(SERVICE)); 443 strncpy(new_serv->name, name, MAX_NAME);443 strncpy(new_serv->name, name, (size_t)MAX_NAME); 444 444 if(type != (char *)0) 445 445 { … … 783 783 dis_dns_p->n_services = htovl(n_services); 784 784 dis_dns_p->size = htovl(DIS_DNS_HEADER + 785 n_services * sizeof(SERVICE_REG));785 n_services * (int)sizeof(SERVICE_REG)); 786 786 serv_regp = dis_dns_p->services; 787 787 strcpy( serv_regp->service_name, "DUMMY_UPDATE_PACKET" ); … … 796 796 } 797 797 if( !dna_write(dnsp->dns_dis_conn_id, &(dnsp->dis_dns_packet), 798 DIS_DNS_HEADER + n_services * sizeof(SERVICE_REG)))798 DIS_DNS_HEADER + n_services * (int)sizeof(SERVICE_REG))) 799 799 { 800 800 release_conn(dnsp->dns_dis_conn_id, 0, 1); … … 826 826 */ 827 827 strncpy( dis_dns_p->task_name, dnsp->task_name, 828 MAX_TASK_NAME-4);828 (size_t)(MAX_TASK_NAME-4) ); 829 829 dis_dns_p->task_name[MAX_TASK_NAME-4-1] = '\0'; 830 830 get_node_addr( dis_dns_p->node_addr ); … … 852 852 dis_dns_p->n_services = htovl(n_services); 853 853 dis_dns_p->size = htovl( DIS_DNS_HEADER + 854 (n_services* sizeof(SERVICE_REG)));854 (n_services*(int)sizeof(SERVICE_REG))); 855 855 if(dnsp->dns_dis_conn_id > 0) 856 856 { … … 863 863 } 864 864 if(!dna_write(dnsp->dns_dis_conn_id, &(dnsp->dis_dns_packet), 865 DIS_DNS_HEADER + n_services* sizeof(SERVICE_REG)))865 DIS_DNS_HEADER + n_services*(int)sizeof(SERVICE_REG))) 866 866 { 867 867 release_conn(dnsp->dns_dis_conn_id, 0, 1); … … 917 917 { 918 918 dis_dns_p->n_services = htovl(n_services); 919 dis_dns_p->size = htovl(DIS_DNS_HEADER +920 n_services * sizeof(SERVICE_REG));919 dis_dns_p->size = (int)htovl(DIS_DNS_HEADER + 920 n_services * (int)sizeof(SERVICE_REG)); 921 921 if(dnsp->dns_dis_conn_id > 0) 922 922 { … … 931 931 &(dnsp->dis_dns_packet), 932 932 DIS_DNS_HEADER + n_services * 933 sizeof(SERVICE_REG)) )933 (int)sizeof(SERVICE_REG)) ) 934 934 { 935 935 release_conn(dnsp->dns_dis_conn_id, 0, 1); … … 946 946 dis_dns_p->n_services = htovl(n_services); 947 947 dis_dns_p->size = htovl(DIS_DNS_HEADER + 948 n_services * sizeof(SERVICE_REG));948 n_services * (int)sizeof(SERVICE_REG)); 949 949 if(dnsp->dns_dis_conn_id > 0) 950 950 { … … 957 957 } 958 958 if( !dna_write(dnsp->dns_dis_conn_id, &(dnsp->dis_dns_packet), 959 DIS_DNS_HEADER + n_services * sizeof(SERVICE_REG)))959 DIS_DNS_HEADER + n_services * (int)sizeof(SERVICE_REG))) 960 960 { 961 961 release_conn(dnsp->dns_dis_conn_id, 0, 1); … … 990 990 */ 991 991 strncpy( dis_dns_p->task_name, dnsp->task_name, 992 MAX_TASK_NAME-4);992 (size_t)(MAX_TASK_NAME-4) ); 993 993 dis_dns_p->task_name[MAX_TASK_NAME-4-1] = '\0'; 994 994 get_node_addr( dis_dns_p->node_addr ); … … 1001 1001 strcpy( serv_regp->service_name, servp->name ); 1002 1002 strcpy( serv_regp->service_def, servp->def ); 1003 serv_regp->service_id = htovl(servp->id | 0x80000000);1003 serv_regp->service_id = (int)htovl( (unsigned)servp->id | 0x80000000); 1004 1004 serv_regp++; 1005 1005 n_services = 1; … … 1007 1007 dis_dns_p->n_services = htovl(n_services); 1008 1008 dis_dns_p->size = htovl(DIS_DNS_HEADER + 1009 n_services * sizeof(SERVICE_REG));1009 n_services * (int)sizeof(SERVICE_REG)); 1010 1010 1011 1011 if(Debug_on) … … 1017 1017 } 1018 1018 if( !dna_write(dnsp->dns_dis_conn_id, &(dnsp->dis_dns_packet), 1019 DIS_DNS_HEADER + n_services * sizeof(SERVICE_REG)) )1019 DIS_DNS_HEADER + n_services * (int)sizeof(SERVICE_REG)) ) 1020 1020 { 1021 1021 release_conn(dnsp->dns_dis_conn_id, 0, 1); … … 1098 1098 extern DIS_DNS_CONN *dis_find_dns(dim_long); 1099 1099 DIS_DNS_CONN *dnsp; 1100 int more_ids[10] = {0};1100 unsigned int more_ids[10] = {0}; 1101 1101 1102 1102 dis_init(); … … 1132 1132 if(Dis_first_time) 1133 1133 { 1134 strncpy( task_name_aux, task, MAX_TASK_NAME );1134 strncpy( task_name_aux, task, (size_t)MAX_TASK_NAME ); 1135 1135 task_name_aux[MAX_TASK_NAME-1] = '\0'; 1136 1136 Port_number = SEEK_PORT; … … 1159 1159 1160 1160 more_ids[0] = do_dis_add_service_dns( str0, "L", &Version_number, 1161 1161 sizeof(Version_number), 0, 0, dnsid ); 1162 1162 1163 1163 more_ids[1] = do_dis_add_service_dns( str1, "C", 0, 0, client_info, (dim_long)dnsp, dnsid ); … … 1464 1464 if( Dis_packet_size ) 1465 1465 free( Dis_packet ); 1466 Dis_packet = (DIS_STAMPED_PACKET *)malloc( DIS_STAMPED_HEADER + size);1466 Dis_packet = (DIS_STAMPED_PACKET *)malloc((size_t)(DIS_STAMPED_HEADER + size)); 1467 1467 if(!Dis_packet) 1468 1468 { … … 1487 1487 tz = 0; 1488 1488 gettimeofday(&tv, tz); 1489 aux = tv.tv_usec / 1000;1489 aux = (int)tv.tv_usec / 1000; 1490 1490 Dis_packet->time_stamp[0] = htovl(aux); 1491 Dis_packet->time_stamp[1] = htovl( tv.tv_sec);1491 Dis_packet->time_stamp[1] = htovl((int)tv.tv_sec); 1492 1492 #endif 1493 1493 } … … 1498 1498 Dis_packet->time_stamp[1] = htovl(servp->user_secs); 1499 1499 } 1500 Dis_packet->reserved[0] = htovl(0xc0dec0de);1500 Dis_packet->reserved[0] = (int)htovl(0xc0dec0de); 1501 1501 Dis_packet->quality = htovl(servp->quality); 1502 1502 } … … 1566 1566 return; 1567 1567 if( !packet_size ) { 1568 dis_packet = (DIS_PACKET *)malloc( DIS_HEADER);1568 dis_packet = (DIS_PACKET *)malloc((size_t)DIS_HEADER); 1569 1569 packet_size = DIS_HEADER; 1570 1570 } 1571 service_id = ( reqp->service_id | 0x80000000);1571 service_id = (int)((unsigned)reqp->service_id | 0x80000000); 1572 1572 dis_packet->service_id = htovl(service_id); 1573 1573 dis_packet->size = htovl(DIS_HEADER); … … 1599 1599 if(!buffer_size) 1600 1600 { 1601 buffer = (int *)malloc( add_size);1601 buffer = (int *)malloc((size_t)add_size); 1602 1602 buffer_size = add_size; 1603 1603 } … … 1607 1607 { 1608 1608 free(buffer); 1609 buffer = (int *)malloc( add_size);1609 buffer = (int *)malloc((size_t)add_size); 1610 1610 buffer_size = add_size; 1611 1611 } … … 1622 1622 { 1623 1623 if(formatp->flags & IT_IS_FLOAT) 1624 formatp->flags |= ( format &0xf0);1625 formatp->flags &= 0xFFF0; /* NOSWAP */1624 formatp->flags |= ((short)format & (short)0xf0); 1625 formatp->flags &= (short)0xFFF0; /* NOSWAP */ 1626 1626 } 1627 1627 } … … 1631 1631 { 1632 1632 if(formatp->flags & IT_IS_FLOAT) 1633 formatp->flags |= ( format &0xf0);1633 formatp->flags |= ((short)format & (short)0xf0); 1634 1634 } 1635 1635 } … … 1992 1992 tz = 0; 1993 1993 gettimeofday(&tv, tz); 1994 servp->user_secs = tv.tv_sec;1995 servp->user_millisecs = tv.tv_usec / 1000;1994 servp->user_secs = (int)tv.tv_sec; 1995 servp->user_millisecs = (int)tv.tv_usec / 1000; 1996 1996 #endif 1997 1997 } … … 2074 2074 if(!packet_size) 2075 2075 { 2076 dis_packet = (DIS_PACKET *)malloc( DIS_HEADER+size);2076 dis_packet = (DIS_PACKET *)malloc((size_t)(DIS_HEADER+size)); 2077 2077 packet_size = DIS_HEADER + size; 2078 2078 } … … 2082 2082 { 2083 2083 free(dis_packet); 2084 dis_packet = (DIS_PACKET *)malloc( DIS_HEADER+size);2084 dis_packet = (DIS_PACKET *)malloc((size_t)(DIS_HEADER+size)); 2085 2085 packet_size = DIS_HEADER+size; 2086 2086 } … … 2091 2091 { 2092 2092 dis_packet->service_id = htovl(reqp->service_id); 2093 memcpy(dis_packet->buffer, buffer, size);2093 memcpy(dis_packet->buffer, buffer, (size_t)size); 2094 2094 dis_packet->size = htovl(DIS_HEADER + size); 2095 2095 … … 2263 2263 { 2264 2264 ENABLE_AST 2265 dis_remove_service( servp->id);2265 dis_remove_service((unsigned)servp->id); 2266 2266 { 2267 2267 DISABLE_AST … … 2371 2371 { 2372 2372 ENABLE_AST 2373 dis_remove_service( servp->id);2373 dis_remove_service((unsigned)servp->id); 2374 2374 { 2375 2375 DISABLE_AST … … 2467 2467 int found = 0; 2468 2468 int release_request(); 2469 DIS_DNS_CONN *dnsp ;2469 DIS_DNS_CONN *dnsp = 0; 2470 2470 2471 2471 DISABLE_AST; … … 2568 2568 if(!curr_allocated_size) 2569 2569 { 2570 service_info_buffer = (char *)malloc( max_size);2570 service_info_buffer = (char *)malloc((size_t)max_size); 2571 2571 curr_allocated_size = max_size; 2572 2572 } … … 2574 2574 { 2575 2575 free(service_info_buffer); 2576 service_info_buffer = (char *)malloc( max_size);2576 service_info_buffer = (char *)malloc((size_t)max_size); 2577 2577 curr_allocated_size = max_size; 2578 2578 } … … 2587 2587 strcat(buff_ptr, servp->name); 2588 2588 strcat(buff_ptr, "\n"); 2589 buff_ptr += strlen(buff_ptr);2589 buff_ptr += (int)strlen(buff_ptr); 2590 2590 } 2591 2591 } … … 2743 2743 sll_init((SLL *) Cmnds_head); 2744 2744 } 2745 new_cmnd = (DIS_CMND *)malloc(( *size)+12);2745 new_cmnd = (DIS_CMND *)malloc((size_t)((*size)+12)); 2746 2746 new_cmnd->next = 0; 2747 2747 new_cmnd->tag = *tag; 2748 2748 new_cmnd->size = *size; 2749 memcpy(new_cmnd->buffer, cmnd_buff, *size);2749 memcpy(new_cmnd->buffer, cmnd_buff, (size_t)*size); 2750 2750 sll_insert_queue((SLL *) Cmnds_head, (SLL *) new_cmnd); 2751 2751 } … … 2782 2782 ret_val = 1; 2783 2783 } 2784 memcpy(buffer, cmndp->buffer, *size);2784 memcpy(buffer, cmndp->buffer, (size_t)*size); 2785 2785 *tag = cmndp->tag; 2786 2786 free(cmndp); … … 2824 2824 2825 2825 strcpy(for_str->dsc$a_pointer, c_str); 2826 for(i = strlen(c_str); i< for_str->dsc$w_length; i++)2826 for(i = (int)strlen(c_str); i< for_str->dsc$w_length; i++) 2827 2827 for_str->dsc$a_pointer[i] = ' '; 2828 2828 } … … 2843 2843 if(!curr_allocated_size) 2844 2844 { 2845 dns_info_buffer = malloc( max_size);2845 dns_info_buffer = malloc((size_t)max_size); 2846 2846 curr_allocated_size = max_size; 2847 2847 } … … 2859 2859 curr_conns[index++] = clip->conn_id; 2860 2860 } 2861 max_size = (index+1)* sizeof(DNS_CLIENT_INFO);2861 max_size = (index+1)*(int)sizeof(DNS_CLIENT_INFO); 2862 2862 if (max_size > curr_allocated_size) 2863 2863 { 2864 2864 free(dns_info_buffer); 2865 dns_info_buffer = malloc( max_size);2865 dns_info_buffer = malloc((size_t)max_size); 2866 2866 curr_allocated_size = max_size; 2867 2867 } … … 2892 2892 } 2893 2893 if(index) 2894 dns_client_info[ strlen(dns_client_info)-1] = '\0';2894 dns_client_info[(int)strlen(dns_client_info)-1] = '\0'; 2895 2895 *bufp = (int *)dns_info_buffer; 2896 *size = strlen(dns_info_buffer)+1;2896 *size = (int)strlen(dns_info_buffer)+1; 2897 2897 } 2898 2898 … … 2967 2967 if(!curr_allocated_size) 2968 2968 { 2969 service_info_buffer = (char *)malloc( max_size);2969 service_info_buffer = (char *)malloc((size_t)max_size); 2970 2970 curr_allocated_size = max_size; 2971 2971 } … … 2973 2973 { 2974 2974 free(service_info_buffer); 2975 service_info_buffer = (char *)malloc( max_size);2975 service_info_buffer = (char *)malloc((size_t)max_size); 2976 2976 curr_allocated_size = max_size; 2977 2977 } … … 2996 2996 servp->registered = Last_n_clients+1; 2997 2997 append_service(buff_ptr, servp); 2998 buff_ptr += strlen(buff_ptr);2998 buff_ptr += (int)strlen(buff_ptr); 2999 2999 } 3000 3000 } … … 3012 3012 { 3013 3013 strcat(buff_ptr, "-"); 3014 buff_ptr += strlen(buff_ptr);3014 buff_ptr += (int)strlen(buff_ptr); 3015 3015 append_service(buff_ptr, servp); 3016 buff_ptr += strlen(buff_ptr);3016 buff_ptr += (int)strlen(buff_ptr); 3017 3017 } 3018 3018 else if(servp->registered < (Last_n_clients+1)) … … 3021 3021 { 3022 3022 strcat(buff_ptr, "+"); 3023 buff_ptr += strlen(buff_ptr);3023 buff_ptr += (int)strlen(buff_ptr); 3024 3024 done = 1; 3025 3025 } 3026 3026 append_service(buff_ptr, servp); 3027 buff_ptr += strlen(buff_ptr);3027 buff_ptr += (int)strlen(buff_ptr); 3028 3028 /* 3029 3029 servp->registered = 2; … … 3034 3034 } 3035 3035 *bufp = (int *)service_info_buffer; 3036 *size = buff_ptr - service_info_buffer+1;3036 *size = (int)(buff_ptr - service_info_buffer+1); 3037 3037 if(*size == 1) 3038 3038 *size = -1; … … 3235 3235 int dis_hash_service_init() 3236 3236 { 3237 3237 3238 int i; 3238 3239 static int done = 0; … … 3242 3243 for( i = 0; i < MAX_HASH_ENTRIES; i++ ) 3243 3244 { 3245 /* 3244 3246 Service_hash_table[i] = (SERVICE *) malloc(sizeof(SERVICE)); 3245 3247 dll_init((DLL *) Service_hash_table[i]); 3248 */ 3249 Service_hash_table[i] = 0; 3246 3250 Service_new_entries[i] = 0; 3247 3251 } 3248 3252 done = 1; 3249 3253 } 3254 3250 3255 return(1); 3251 3256 } … … 3255 3260 int index; 3256 3261 index = HashFunction(servp->name, MAX_HASH_ENTRIES); 3262 if(!Service_hash_table[index]) 3263 { 3264 Service_hash_table[index] = (SERVICE *) malloc(sizeof(SERVICE)); 3265 dll_init((DLL *) Service_hash_table[index]); 3266 } 3257 3267 Service_new_entries[index]++; 3258 3268 dll_insert_queue((DLL *) Service_hash_table[index], … … 3272 3282 int dis_hash_service_remove(SERVICE *servp) 3273 3283 { 3284 int index; 3285 index = HashFunction(servp->name, MAX_HASH_ENTRIES); 3286 if(!Service_hash_table[index]) 3287 { 3288 return(0); 3289 } 3274 3290 dll_remove( (DLL *) servp ); 3275 3291 return(1); … … 3283 3299 3284 3300 index = HashFunction(name, MAX_HASH_ENTRIES); 3301 if(!Service_hash_table[index]) 3302 { 3303 return((SERVICE *)0); 3304 } 3285 3305 if( (servp = (SERVICE *) dll_search( 3286 3306 (DLL *) Service_hash_table[index], 3287 name, strlen(name)+1)) )3307 name, (int)strlen(name)+1)) ) 3288 3308 { 3289 3309 return(servp); … … 3314 3334 do 3315 3335 { 3316 if((!new_entries) || (Service_new_entries[index] > 0)) 3317 { 3318 servp = (SERVICE *) dll_get_next( 3336 if(prevp) 3337 { 3338 if((!new_entries) || (Service_new_entries[index] > 0)) 3339 { 3340 servp = (SERVICE *) dll_get_next( 3319 3341 (DLL *) Service_hash_table[index], 3320 3342 (DLL *) prevp); 3321 if(servp) 3322 break; 3343 if(servp) 3344 break; 3345 } 3323 3346 } 3324 3347 index++;
Note:
See TracChangeset
for help on using the changeset viewer.