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

merge conflict from 3.0.1

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-17 11:35:15 +01:00
parent db2fef5d69 823d537825
commit 1dee950870
7 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -8,9 +8,7 @@
*/
#include "ansi.h"
#include "sls_receiver_defs.h"
//#define ZMQ_DETAIL
#include <zmq.h>
#include <errno.h>
@ -21,7 +19,8 @@
#include <unistd.h> //usleep in some machines
using namespace rapidjson;
#define DEFAULT_ZMQ_PORTNO 30001
//#define ZMQ_DETAIL
class ZmqSocket {

12
slsReceiverSoftware/include/genericSocket.h
View File

@ -51,27 +51,21 @@ class sockaddr_in;
#include <ifaddrs.h>
#endif
#include <stdlib.h> /******exit */
#include <stdlib.h> /******exit */
#include <unistd.h>
#include <string.h>
#include <iostream>
#include <math.h>
#include <errno.h>
#include <stdio.h>
using namespace std;
#define DEFAULT_PACKET_SIZE 1286
/*#define SOCKET_BUFFER_SIZE (100*1024*1024) //100MB*/
#define SOCKET_BUFFER_SIZE (2000*1024*1024) //100MB
#define DEFAULT_PORTNO 1952
#define DEFAULT_BACKLOG 5
#define DEFAULT_UDP_PORTNO 50001
#define DEFAULT_GUI_PORTNO 65000
//#define DEFAULT_ZMQ_PORTNO defined in zmqSocket.h (40001)
class genericSocket{
@ -109,7 +103,7 @@ enum communicationProtocol{
struct addrinfo *result;
if (!ConvertHostnameToInternetAddress(host_ip_or_name, &result)) {
serverAddress.sin_family = result->ai_family;
memcpy((char *) &serverAddress.sin_addr.s_addr, &((struct sockaddr_in *) result->ai_addr)->sin_addr, result->ai_addrlen);
memcpy((char *) &serverAddress.sin_addr.s_addr, &((struct sockaddr_in *) result->ai_addr)->sin_addr, sizeof(in_addr_t));
freeaddrinfo(result);
serverAddress.sin_port = htons(port_number);
socketDescriptor=0;

7
slsReceiverSoftware/include/sls_receiver_defs.h
View File

@ -29,6 +29,13 @@ typedef int int32_t;
#define DEFAULT_STREAMING_TIMER_IN_MS 200
/** default ports */
#define DEFAULT_PORTNO 1952
#define DEFAULT_UDP_PORTNO 50001
#define DEFAULT_GUI_PORTNO 65001
#define DEFAULT_ZMQ_CL_PORTNO 30001
#define DEFAULT_ZMQ_RX_PORTNO 30001
/**
\file sls_receiver_defs.h
This file contains all the basic definitions common to the slsReceiver class