detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-26 08:10:02 +02:00
Code Issues Actions Packages Releases Activity

fixed alignment of macs and port due to structure

Browse Source
This commit is contained in:
maliakal_d 2021-08-30 14:19:31 +02:00
parent 0233afb8d2
commit 171175afd1
4 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
slsDetectorServers/eigerDetectorServer/Beb.c
View File

@ -10,9 +10,6 @@
#define MAX(x, y) (((x) > (y)) ? (x) : (y)) #define MAX(x, y) (((x) > (y)) ? (x) : (y))
#define EMPTY_MAC_ADDRESS "00:00:00:00:00:00"
#define EMPTY_IP_ADDRESS "000.000.000.000"
struct LocalLinkInterface ll_beb_local, *ll_beb; struct LocalLinkInterface ll_beb_local, *ll_beb;
struct udp_header_type udp_header; struct udp_header_type udp_header;
@ -87,16 +84,15 @@ void Beb_Beb() {
void Beb_ClearHeaderData(int ten_gig) { void Beb_ClearHeaderData(int ten_gig) {
for (int i = 0; i < MAX_UDP_DESTINATION; ++i) { for (int i = 0; i < MAX_UDP_DESTINATION; ++i) {
if (!Beb_SetUpUDPHeader(i, ten_gig, EMPTY_MAC_ADDRESS, EMPTY_IP_ADDRESS, 0, EMPTY_MAC_ADDRESS, EMPTY_IP_ADDRESS, 0)) { if (!Beb_SetUpUDPHeader(i, ten_gig, 0, 0, 0, 0, 0, 0)) {
LOG(logERROR, ("Could not clear header data for entry %d (tengiga:%d)\n", i, ten_gig)); LOG(logERROR, ("Could not clear header data for entry %d (tengiga:%d)\n", i, ten_gig));
} }
} }
} }
int Beb_SetUpUDPHeader(unsigned int header_number, int ten_gig, int Beb_SetUpUDPHeader(unsigned int header_number, int ten_gig,
uint64_t src_mac, uint32_t src_ip, unsigned int src_port, uint64_t src_mac, uint32_t src_ip, uint16_t src_port,
uint64_t dst_mac, uint32_t dst_ip, uint64_t dst_mac, uint32_t dst_ip, uint16_t dst_port) {
unsigned int dst_port) {
if (!Beb_activated) if (!Beb_activated)
return 1; return 1;
@ -123,27 +119,52 @@ int Beb_SetUpUDPHeader(unsigned int header_number, int ten_gig,
return 1; return 1;
} }
int Beb_SetHeaderData(uint64_t src_mac, uint32_t src_ip, unsigned int src_port, int Beb_SetHeaderData(uint64_t src_mac, uint32_t src_ip, uint16_t src_port,
uint64_t dst_mac, uint32_t dst_ip, uint64_t dst_mac, uint32_t dst_ip, uint16_t dst_port) {
unsigned int dst_port) {
memcpy(&(udp_header.src_mac[0]), &src_mac, sizeof(udp_header.src_mac)); // src mac is after dst mac in structure (6 bit each)
LOG(logDEBUG1, ("Setting Source MAC to 0x%lx\n", (long long unsigned int)src_mac)); uint16_t src_msb = ((src_mac >> 32) & BIT16_MASK);
uint32_t src_lsb = ((src_mac >> 0) & BIT32_MASK);
memcpy(&(udp_header.src_mac[0]), &src_msb, sizeof(src_msb));
memcpy(&(udp_header.src_mac[2]), &src_lsb, sizeof(src_lsb));
for (int i = 0; i < 6; ++i) {
LOG(logDEBUG1,
("src mac[%d]: %02x\n", i, (uint8_t *)udp_header.src_mac[i]));
}
memcpy(&(udp_header.src_ip[0]), &src_ip, sizeof(udp_header.src_ip)); memcpy(&(udp_header.src_ip[0]), &src_ip, sizeof(udp_header.src_ip));
LOG(logDEBUG1, ("Setting Source IP to 0x%x\n", src_ip)); for (int i = 0; i < 4; ++i) {
LOG(logDEBUG1,
("src ip[%d]: %02x\n", i, (uint8_t *)udp_header.src_ip[i]));
}
memcpy(&(udp_header.src_port[0]), &src_port, sizeof(udp_header.src_port)); memcpy(&(udp_header.src_port[0]), &src_port, sizeof(udp_header.src_port));
LOG(logDEBUG1, ("Setting Source Port to 0x%x\n", src_port)); for (int i = 0; i < 2; ++i) {
LOG(logDEBUG1,
("src port[%d]: %02x\n", i, (uint8_t *)udp_header.src_port[i]));
}
memcpy(&(udp_header.dst_mac[0]), &dst_mac, sizeof(udp_header.dst_mac)); uint32_t dst_msb = ((dst_mac >> 16) & BIT32_MASK);
LOG(logDEBUG1, ("Setting Destination MAC to 0x%lx\n", (long long unsigned int)dst_mac)); uint16_t dst_lsb = ((dst_mac >> 0) & BIT16_MASK);
memcpy(&(udp_header.dst_mac[0]), &dst_msb, sizeof(dst_msb));
memcpy(&(udp_header.dst_mac[4]), &dst_lsb, sizeof(dst_lsb));
for (int i = 0; i < 6; ++i) {
LOG(logDEBUG1,
("dst mac[%d]: %02x\n", i, (uint8_t *)udp_header.dst_mac[i]));
}
memcpy(&(udp_header.dst_ip[0]), &dst_ip, sizeof(udp_header.dst_ip)); memcpy(&(udp_header.dst_ip[0]), &dst_ip, sizeof(udp_header.dst_ip));
LOG(logDEBUG1, ("Setting Destination IP to 0x%x\n", dst_ip)); for (int i = 0; i < 4; ++i) {
LOG(logDEBUG1,
("dst ip[%d]: %02x\n", i, (uint8_t *)udp_header.dst_ip[i]));
}
memcpy(&(udp_header.src_port[0]), &dst_port, sizeof(udp_header.src_port)); memcpy(&(udp_header.dst_port[0]), &dst_port,
LOG(logDEBUG1, ("Setting Source Port to 0x%x\n", dst_port)); sizeof(udp_header.dst_port));
for (int i = 0; i < 2; ++i) {
LOG(logDEBUG1,
("dst port[%d]: %02x\n", i, (uint8_t *)udp_header.dst_port[i]));
}
Beb_AdjustIPChecksum(&udp_header); Beb_AdjustIPChecksum(&udp_header);
@ -157,7 +178,6 @@ int Beb_SetHeaderData(uint64_t src_mac, uint32_t src_ip, unsigned int src_port,
return 1; return 1;
} }
void Beb_AdjustIPChecksum(struct udp_header_type *ip) { void Beb_AdjustIPChecksum(struct udp_header_type *ip) {
unsigned char *cptr = (unsigned char *)ip->ver_headerlen; unsigned char *cptr = (unsigned char *)ip->ver_headerlen;

9
slsDetectorServers/eigerDetectorServer/Beb.h
View File

@ -7,11 +7,10 @@
void Beb_Beb(); void Beb_Beb();
void Beb_ClearHeaderData(int ten_gig); void Beb_ClearHeaderData(int ten_gig);
int Beb_SetUpUDPHeader(unsigned int header_number, int ten_gig, int Beb_SetUpUDPHeader(unsigned int header_number, int ten_gig,
uint64_t src_mac, uint32_t src_ip, unsigned int src_port, uint64_t src_mac, uint32_t src_ip, uint16_t src_port,
uint64_t dst_mac, uint32_t dst_ip, uint64_t dst_mac, uint32_t dst_ip, uint16_t dst_port);
unsigned int dst_port); int Beb_SetHeaderData(uint64_t src_mac, uint32_t src_ip, uint16_t src_port,
int Beb_SetHeaderData(uint64_t src_mac, uint32_t src_ip, unsigned int src_port, uint64_t dst_mac, uint32_t dst_ip, uint16_t dst_port);
uint64_t dst_mac, uint32_t dst_ip, unsigned int dst_port);
void Beb_AdjustIPChecksum(struct udp_header_type *ip); void Beb_AdjustIPChecksum(struct udp_header_type *ip);
void Beb_GetModuleConfiguration(int *master, int *top, int *normal); void Beb_GetModuleConfiguration(int *master, int *top, int *normal);

2
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -1579,7 +1579,7 @@ int configureMAC() {
} }
return OK; return OK;
#else #else
int dst_port = dstport; uint16_t dst_port = dstport;
if (!top) if (!top)
dst_port = dstport2; dst_port = dstport2;

2
slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -126,6 +126,8 @@ enum MASTERINDEX { MASTER_HARDWARE, OW_MASTER, OW_SLAVE };
#define UDP_HEADER_MAX_FRAME_VALUE (0xFFFFFFFFFFFF) #define UDP_HEADER_MAX_FRAME_VALUE (0xFFFFFFFFFFFF)
#define BIT16_MASK (0xFFFF)
#define DAC_MIN_MV (0) #define DAC_MIN_MV (0)
#define DAC_MAX_MV (2048) #define DAC_MAX_MV (2048)
#define LTC2620_MIN_VAL \ #define LTC2620_MIN_VAL \