fanasina/y_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

y_file_handler: filename to readlink if exists

Browse Source
This commit is contained in:
fanasina
2025-12-16 09:34:42 +01:00
parent 1258c4638f
commit bacc12e0f0
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
y_socket_t/src/y_socket_t/y_file_handler.c
+16 -20
View File
@@ -536,8 +536,18 @@ void* y_socket_send_file_for_node(void* arg){
struct pollfd *fds=argS->fds; struct pollfd *fds=argS->fds;
y_NODE_T node=argS->node; y_NODE_T node=argS->node;
char linkedFileName[BUF_SIZE+1];
linkedFileName[0]='\0';
ssize_t lenLinkedFileName = readlink(argS->filename, linkedFileName, BUF_SIZE);
char * filename=argS->filename; char * filename;
if(lenLinkedFileName==-1)
filename=argS->filename;
else{
filename=malloc(lenLinkedFileName + 1);
strcpy(filename, linkedFileName);
}
#if TEMP_ADDR #if TEMP_ADDR
char tempAddr[64]; char tempAddr[64];
#endif #endif
@@ -606,27 +616,11 @@ for(int tour_i=0;(tour_i<4) && (check_if_in_ok_header_l_(argS->m_ok_head_l_t, na
++seq; ++seq;
len_local_header_ = sprintf(buf_send, "{ \"cmd\" : \"post file %s\", \"seq\" : %ld , \"tm\" : \"%ld\" }",filename, seq, timeid); len_local_header_ = sprintf(buf_send, "{ \"cmd\" : \"post file %s\", \"seq\" : %ld , \"tm\" : \"%ld\" }",filename, seq, timeid);
} }
char linkedFileName[BUF_SIZE+1];
linkedFileName[0]='\0';
ssize_t lenLinkedFileName = readlink(argS->filename, linkedFileName, BUF_SIZE);
if(argS->dst_dir){ if(argS->dst_dir){
if(lenLinkedFileName==-1) len_local_header_ = sprintf(buf_send, "{ \"cmd\" : \"post file %s\", \"seq\" : %ld , \"EOF\" : true , \"tm\" : \"%ld\" , \"dst_dir\" : \"%s\" }",filename, seq, timeid, argS->dst_dir);
len_local_header_ = sprintf(buf_send, "{ \"cmd\" : \"post file %s\", \"seq\" : %ld , \"EOF\" : true , \"tm\" : \"%ld\" , \"dst_dir\" : \"%s\" }",filename, seq, timeid, argS->dst_dir);
else{
char *optLinked=malloc(lenLinkedFileName+1);
strcpy(optLinked, linkedFileName);
len_local_header_ = sprintf(buf_send, "{ \"cmd\" : \"post file %s\", \"seq\" : %ld , \"EOF\" : true , \"tm\" : \"%ld\" , \"dst_dir\" : \"%s\" , \"readlink\" : \"%s\" }",filename, seq, timeid, argS->dst_dir, optLinked);
free(optLinked);
}
}else{ }else{
if(lenLinkedFileName==-1) len_local_header_ = sprintf(buf_send, "{ \"cmd\" : \"post file %s\", \"seq\" : %ld , \"EOF\" : true , \"tm\" : \"%ld\" }",filename, seq, timeid);
len_local_header_ = sprintf(buf_send, "{ \"cmd\" : \"post file %s\", \"seq\" : %ld , \"EOF\" : true , \"tm\" : \"%ld\" }",filename, seq, timeid);
else {
char *optLinked=malloc(lenLinkedFileName+1);
len_local_header_ = sprintf(buf_send, "{ \"cmd\" : \"post file %s\", \"seq\" : %ld , \"EOF\" : true , \"tm\" : \"%ld\" , \"readlink\" : \"%s\" }",filename, seq, timeid, optLinked);
free(optLinked);
}
} }
if(sendto(fds[(c_af==AF_INET6)].fd, if(sendto(fds[(c_af==AF_INET6)].fd,
buf_send, len_local_header_, buf_send, len_local_header_,
@@ -642,7 +636,7 @@ for(int tour_i=0;(tour_i<4) && (check_if_in_ok_header_l_(argS->m_ok_head_l_t, na
close(fd_file); close(fd_file);
///printf("debug: fd=%d closed: filename=%s, for %s\n",fd_file,filename, tempAddr); ///printf("debug: fd=%d closed: filename=%s, for %s\n",fd_file,filename, tempAddr);
size_t delay = 4000000; size_t delay = 4000000;
printf("debug: wait %ld before checking, in tour:%d\n",delay, tour_i); printf("debug: wait %ld before checking, in tour:%d\n",delay, tour_i);
usleep(delay); usleep(delay);
@@ -656,6 +650,8 @@ remove_header_ok_if_done(argS->m_ok_head_l_t, nameid);
//free(timeid); //free(timeid);
purge_ptr_type_list_y_ptr_STRING(m_str_name_f); purge_ptr_type_list_y_ptr_STRING(m_str_name_f);
if(lenLinkedFileName !=-1) free(filename);
return NULL; return NULL;
} }
/// ///