detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 16:27:13 +02:00
Code Issues Actions Packages Releases Activity

jungfrau server works

Browse Source
This commit is contained in:
maliakal_d
2018-11-02 13:50:00 +01:00
parent 92123069ce
commit b43be57b6e
33 changed files with 561 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorServers/slsDetectorServer/communication_funcs.c
View File

@ -1,14 +1,15 @@
#include "communication_funcs.h"
#include "logger.h"
//#include <netinet/tcp.h> /* for TCP_NODELAY */
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <sys/time.h>
#include <arpa/inet.h>
#include <unistd.h>
#define SEND_REC_MAX_SIZE 4096
#define DEFAULT_PORTNO 1952
#define DEFAULT_BACKLOG 5
// Global variables from errno.h
extern int errno;
@ -25,7 +26,6 @@ char mess[MAX_STR_LENGTH];
// Local variables
char dummyClientIP[INET_ADDRSTRLEN] = "";
const int send_rec_max_size = SEND_REC_MAX_SIZE;
int myport = -1;
// socket descriptor set
fd_set readset, tempset;
@ -36,10 +36,6 @@ int isock = 0;
int maxfd = 0;
#define DEFAULT_BACKLOG 5
int bindSocket(unsigned short int port_number) {
ret = FAIL;
int socketDescriptor = -1;
@ -324,7 +320,7 @@ int receiveDataOnly(int file_des, void* buf,int length) {
length, (isControlServer ? "control":"stop")));
while(length > 0) {
nreceiving = (length>send_rec_max_size) ? send_rec_max_size:length; // (condition) ? if_true : if_false
nreceiving = (length>SEND_REC_MAX_SIZE) ? SEND_REC_MAX_SIZE:length; // (condition) ? if_true : if_false
nreceived = read(file_des,(char*)buf+total_received,nreceiving);
if(!nreceived){
if(!total_received) {