leonarski_f
75e401f0e5
Build Packages / Unit tests (push) Successful in 1h31m59s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 8m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m27s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m56s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m24s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 10m27s
Build Packages / build:rpm (rocky8) (push) Successful in 9m20s
Build Packages / build:rpm (rocky9) (push) Successful in 10m50s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 9m54s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m38s
Build Packages / DIALS test (push) Successful in 12m13s
Build Packages / XDS test (durin plugin) (push) Successful in 7m8s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m8s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m50s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / Build documentation (push) Successful in 50s
Build Packages / Create release (push) Skipped
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * jfjoch_broker: Add EXPERIMENTAL pixelrefine mode for image processing * jfjoch_broker: Allow to load user mask from 8-bit and 16-bit TIFF files * jfjoch_broker: Add ROI calculation in non-FPGA workflow * jfjoch_broker: Fixes to TCP image pusher * jfjoch_broker: Remove NUMA bindings * jfjoch_broker: Improvements to indexing * jfjoch_broker: For PSI EIGER, trimming energies are taken from the detector configuration (now compulsory) instead of hardcoded values * jfjoch_writer: Save ROI definitions and the per-pixel ROI bitmap in the master file; azimuthal ROIs support phi (angular) sectors * jfjoch_viewer: Major redesign with dockable panels and saved layouts, plus on-canvas creation/move/resize of box, circle and azimuthal ROIs * jfjoch_viewer: Run jfjoch_process reprocessing jobs from inside the GUI and overlay per-run results Reviewed-on: #63
56 lines
1.8 KiB
C++
56 lines
1.8 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#ifdef _WIN32
|
|
#include <winsock2.h>
|
|
#include <ws2tcpip.h>
|
|
#else
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
#include <sstream>
|
|
#include <iomanip>
|
|
|
|
#include "NetworkAddressConvert.h"
|
|
#include "JFJochException.h"
|
|
|
|
uint32_t IPv4AddressFromStr(const std::string& addr) {
|
|
in_addr ipv4_addr{};
|
|
if (inet_pton(AF_INET, addr.c_str(), &ipv4_addr) != 1)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Need proper IPv4 address");
|
|
return ipv4_addr.s_addr;
|
|
}
|
|
|
|
std::string IPv4AddressToStr(uint32_t addr) {
|
|
char tmp[256];
|
|
if (inet_ntop(AF_INET, &addr, tmp, 255) != tmp)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Error in exporting IPv4 address");
|
|
return {tmp};
|
|
}
|
|
|
|
std::string MacAddressToStr(uint64_t addr) {
|
|
uint64_t mac_address_network_order = addr;
|
|
std::ostringstream ss;
|
|
for (int i = 0; i < 6; i++) {
|
|
ss << std::setfill('0') << std::setw(2) << std::hex << ((mac_address_network_order >> (i * 8)) & 0xFF);
|
|
if (i != 5) ss << ":";
|
|
}
|
|
return ss.str();
|
|
}
|
|
|
|
uint64_t MacAddressFromStr(const std::string &addr) {
|
|
uint64_t ret = 0;
|
|
uint32_t values[6];
|
|
char end_char;
|
|
if( sscanf( addr.c_str(), "%x:%x:%x:%x:%x:%x%c",
|
|
&values[0], &values[1], &values[2],
|
|
&values[3], &values[4], &values[5], &end_char ) != 6 )
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "MAC address invalid");
|
|
|
|
for (int i = 0; i < 6; i++) {
|
|
if (values[i] > 255)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "MAC address out of range");
|
|
ret |= (uint64_t)values[i] << (i*8);
|
|
}
|
|
return ret;
|
|
}
|