Add udp server id to debug logs

Author: tstenner

src/resolve_attempt_udp.cpp

@@ -50,6 +50,9 @@ resolve_attempt_udp::resolve_attempt_udp(io_context &io, const udp &protocol,
 	os << recv_socket_.local_endpoint().port() << " " << query_id_ << "\r\n";
 	query_msg_ = os.str();
 
+	DLOG_F(2, "Waiting for query results (port %d) for %s", recv_socket_.local_endpoint().port(),
+		query_msg_.c_str());
+
 	// register ourselves as a candidate for cancellation
 	if (registry) register_at(registry);
 }

src/tcp_server.cpp

@@ -347,7 +347,7 @@ void client_session::handle_read_feedparams(
 	int request_protocol_version, std::string request_uid, error_code err) {
 	try {
 		if (!err) {
-			DLOG_F(3, "%p got a streamfeed request", this);
+			DLOG_F(2, "%p got a streamfeed request", this);
 			// --- protocol negotiation ---
 
 			// check request validity
@@ -356,7 +356,7 @@ void client_session::handle_read_feedparams(
 				send_status_message(
 					"LSL/" + std::to_string(api_config::get_instance()->use_protocol_version()) +
 					" 505 Version not supported");
-				DLOG_F(INFO, "%p Got a request for a too new protocol version", this);
+				DLOG_F(WARNING, "%p Got a request for a too new protocol version", this);
 				return;
 			}
 			if (!request_uid.empty() && request_uid != serv_->info_->uid()) {
@@ -408,7 +408,7 @@ void client_session::handle_read_feedparams(
 						if (type == "max-chunk-length") chunk_granularity_ = std::stoi(rest);
 						if (type == "protocol-version") client_protocol_version = std::stoi(rest);
 					} else {
-						DLOG_F(4, "%p Request line '%s' contained no key-value pair", this,
+						DLOG_F(WARNING, "%p Request line '%s' contained no key-value pair", this,
 							hdrline.c_str());
 					}
 				}
@@ -492,7 +492,7 @@ void client_session::handle_read_feedparams(
 				*sock_, feedbuf_.data(), [shared_this = shared_from_this()](err_t err, size_t len) {
 					shared_this->handle_send_feedheader_outcome(err, len);
 				});
-			DLOG_F(4, "%p sent test pattern samples", this);
+			DLOG_F(2, "%p sent test pattern samples", this);
 		}
 	} catch (std::exception &e) {
 		LOG_F(WARNING, "Unexpected error while serializing the feed header: %s", e.what());

src/udp_server.cpp

@@ -25,7 +25,8 @@ udp_server::udp_server(const stream_info_impl_p &info, io_context &io, udp proto
 		info_->v4service_port(port);
 	else
 		info_->v6service_port(port);
-	LOG_F(2, "%s: Started unicast udp server %p at port %d", info_->name().c_str(), this, port);
+	LOG_F(2, "%s: Started unicast udp server at port %d (addr %p)", info_->name().c_str(), port,
+		(void *)this);
 }
 
 udp_server::udp_server(const stream_info_impl_p &info, io_context &io, const std::string &address,
@@ -67,8 +68,8 @@ udp_server::udp_server(const stream_info_impl_p &info, io_context &io, const std
 		else
 			socket_->set_option(ip::multicast::join_group(addr));
 	}
-	LOG_F(2, "%s: Started multicast udp server at %s port %d", this->info_->name().c_str(),
-		address.c_str(), port);
+	LOG_F(2, "%s: Started multicast udp server at %s port %d (addr %p)",
+		this->info_->name().c_str(), address.c_str(), port, (void *)this);
 }
 
 // === externally issued asynchronous commands ===
@@ -123,8 +124,12 @@ void udp_server::handle_receive_outcome(error_code err, std::size_t len) {
 					request_stream >> return_port;
 					std::string query_id;
 					request_stream >> query_id;
+					DLOG_F(2, "%p shortinfo req from %s for %s", (void *)this,
+						remote_endpoint_.address().to_string().c_str(), query.c_str());
 					// check query
 					if (info_->matches_query(query)) {
+						LOG_F(
+							3, "%p query matches, replying to port %d", (void *)this, return_port);
 						// query matches: send back reply
 						udp::endpoint return_endpoint(remote_endpoint_.address(), return_port);
 						string_p replymsg(
@@ -136,8 +141,7 @@ void udp_server::handle_receive_outcome(error_code err, std::size_t len) {
 							});
 						return;
 					} else {
-						DLOG_F(INFO, "%p Got shortinfo query for mismatching query string: %s", this,
-							query.c_str());
+						DLOG_F(2, "%p query didn't match", (void *)this);
 					}
 				} else if (time_services_enabled_ && method == "LSL:timedata") {
 					// timedata request: parse time of original transmission
@@ -158,11 +162,13 @@ void udp_server::handle_receive_outcome(error_code err, std::size_t len) {
 						});
 					return;
 				} else {
-					DLOG_F(INFO, "Unknown method '%s' received by udp-server", method.c_str());
+					DLOG_F(INFO, "%p Unknown method '%s' received by udp-server", (void *)this,
+						method.c_str());
 				}
 			}
 		} catch (std::exception &e) {
-			LOG_F(WARNING, "udp_server: hiccup during request processing: %s", e.what());
+			LOG_F(WARNING, "%p udp_server: hiccup during request processing: %s", (void *)this,
+				e.what());
 		}
 		request_next_packet();
 	}