From 596500b1300a8c4d6bab54db81e45b1957092347 Mon Sep 17 00:00:00 2001 From: Andrea Bondavalli Date: Fri, 20 Mar 2020 22:58:21 +0100 Subject: [PATCH] Minor changes --- daemon/config.hpp | 2 +- daemon/session_manager.cpp | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/daemon/config.hpp b/daemon/config.hpp index d3b03fc..a9ebc71 100644 --- a/daemon/config.hpp +++ b/daemon/config.hpp @@ -129,7 +129,7 @@ class Config { std::string ip_str_; std::string config_filename_; - /* recofing needs daemon need_restart */ + /* reconfig needs daemon restart */ bool need_restart_{false}; }; diff --git a/daemon/session_manager.cpp b/daemon/session_manager.cpp index 16e16e0..8f3b3a4 100644 --- a/daemon/session_manager.cpp +++ b/daemon/session_manager.cpp @@ -444,13 +444,10 @@ static std::array get_mcast_mac_addr(uint32_t mcast_ip) { // As defined by IANA, the most significant 24 bits of an IPv4 multicast // MAC address are 0x01005E. // Bit 25 is 0, and the other 23 bits are the // least significant 23 bits of an IPv4 multicast address. - uint64_t mac_addr = 0x01005E000000 | (mcast_ip & 0x7FFFFF); - return { static_cast(mac_addr >> 40), - static_cast(mac_addr >> 32), - static_cast(mac_addr >> 24), - static_cast(mac_addr >> 16), - static_cast(mac_addr >> 8), - static_cast(mac_addr) }; + return { 0x01, 0x00, 0x5e, + static_cast((mcast_ip >> 16) & 0x7F), + static_cast(mcast_ip >> 8), + static_cast(mcast_ip) }; } std::error_code SessionManager::add_source(const StreamSource& source) {