fumiama/simple-kanban
1
0
Fork 0
mirror of https://github.com/fumiama/simple-kanban.git synced 2026-06-08 18:10:24 +08:00
Code Activity

再次适配linux

Browse Source
This commit is contained in:
fumiama
2021-05-03 00:18:06 +08:00
parent 0a0a449a8f
commit ced6a6afca
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client.c
View File

@@ -47,6 +47,10 @@ int main(int argc,char *argv[]) { //usage: ./client host port
ssize_t numbytes;
puts("break!");
while((sockfd = socket(AF_INET,SOCK_STREAM,0)) == -1);
#if !__APPLE__
int reuse = 1;
setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
#endif
puts("Get sockfd");
their_addr.sin_family = AF_INET;
their_addr.sin_port = htons(atoi(argv[2]));
@@ -84,7 +88,7 @@ int main(int argc,char *argv[]) { //usage: ./client host port
else puts("Send file error.");
#else
send(sockfd, &file_size, sizeof(uint32_t), 0);
if(!sendfile(sockfd, fileno(fp), &len, htonl(file_size))) puts("Send file success.");
if(!sendfile(sockfd, fileno(fp), &len, file_size)) puts("Send file success.");
else puts("Send file error.");
#endif
fclose(fp);

8
server.c
View File

@@ -76,8 +76,12 @@ int bindServer(uint16_t port, u_int try_times) {
server_addr.sin_port = htons(port);
server_addr.sin_addr.s_addr = INADDR_ANY;
bzero(&(server_addr.sin_zero), 8);
fd = socket(AF_INET, SOCK_STREAM, 0);
#if !__APPLE__
int reuse = 1;
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
#endif
while(!~(result = bind(fd, (struct sockaddr *)&server_addr, struct_len)) && fail_count++ < try_times) sleep(1);
if(!~result && fail_count >= try_times) {
puts("Bind server failure!");
@@ -137,7 +141,7 @@ int sendAll(char* file_path, THREADTIMER *timer) {
sendfile(fileno(fp), timer->accept_fd, 0, &len, &hdtr, 0);
#else
send(timer->accept_fd, &file_size, sizeof(uint32_t), 0);
sendfile(timer->accept_fd, fileno(fp), &len, htonl(file_size));
sendfile(timer->accept_fd, fileno(fp), &len, file_size);
#endif
printf("Send %lld bytes.\n", len);
closeFile(fp);