nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tidy up diagnostic messages

Browse Source
This commit is contained in:
Mike Brady
2016-05-02 09:45:44 +01:00
parent c50af16abb
commit 1fd794af71
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtp.c
+8 -8
View File
@@ -607,16 +607,14 @@ void rtp_setup(SOCKADDR *local, SOCKADDR *remote, int cport, int tport, uint32_t
// print out what we know about the client
void *client_addr,*self_addr;
char *ipver;
int client_port,self_port;
char client_port_str[20];
char self_addr_str[20];
char client_port_str[64];
char self_addr_str[64];
connection_ip_family = remote->SAFAMILY; // keep information about the kind of ip of the client
#ifdef AF_INET6
if (connection_ip_family == AF_INET6) {
ipver = "IPv6";
struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)remote;
client_addr = &(sa6->sin6_addr);
client_port = ntohs(sa6->sin6_port);
@@ -626,7 +624,6 @@ void rtp_setup(SOCKADDR *local, SOCKADDR *remote, int cport, int tport, uint32_t
}
#endif
if (connection_ip_family == AF_INET) {
ipver = "IPv4";
struct sockaddr_in *sa4 = (struct sockaddr_in *)remote;
client_addr = &(sa4->sin_addr);
client_port = ntohs(sa4->sin_port);
@@ -634,11 +631,14 @@ void rtp_setup(SOCKADDR *local, SOCKADDR *remote, int cport, int tport, uint32_t
self_addr = &(sa4->sin_addr);
self_port = ntohs(sa4->sin_port);
}
inet_ntop(connection_ip_family, client_addr, client_ip_string,
sizeof(client_ip_string)); // keep the client's ip number
sizeof(client_ip_string));
inet_ntop(connection_ip_family, self_addr, self_ip_string,
sizeof(self_ip_string)); // keep the client's ip number
debug(1, "Connection via %s from AirPlay client at: %s:%u to this Shairport Sync AirPlay server at: %s:%u.", ipver, client_ip_string, client_port,self_ip_string,self_port);
sizeof(self_ip_string));
debug(1, "Set up play connection from %s to self at %s.", client_ip_string,self_ip_string);
// set up a the record of the remote's control socket
struct addrinfo hints;
rtsp.c
+15 -10
View File
@@ -1914,34 +1914,39 @@ void rtsp_listen_loop(void) {
socklen_t size_of_reply = sizeof(*local_info);
memset(local_info,0,sizeof(SOCKADDR));
if (getsockname(conn->fd, (struct sockaddr*)local_info, &size_of_reply)==0) {
char host[1024];
char service[20];
// IPv4:
if (local_info->SAFAMILY==AF_INET) {
char ip4[INET_ADDRSTRLEN]; // space to hold the IPv4 string
struct sockaddr_in *sa = (struct sockaddr_in*)local_info; // pretend this is loaded with something
char remote_ip4[INET_ADDRSTRLEN]; // space to hold the IPv4 string
struct sockaddr_in *sa = (struct sockaddr_in*)local_info;
inet_ntop(AF_INET, &(sa->sin_addr), ip4, INET_ADDRSTRLEN);
unsigned short int tport = ntohs(sa->sin_port);
debug(1,"New RTSP connection at: %s:%u", ip4,tport);
sa = (struct sockaddr_in*)&conn->remote;
inet_ntop(AF_INET, &(sa->sin_addr), remote_ip4, INET_ADDRSTRLEN);
unsigned short int rport = ntohs(sa->sin_port);
debug(1,"New RTSP connection from %s:%u to self at %s:%u.",remote_ip4,rport,ip4,tport);
}
#ifdef AF_INET6
if (local_info->SAFAMILY==AF_INET6) {
// IPv6:
char ip6[INET6_ADDRSTRLEN]; // space to hold the IPv6 string
struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)local_info; ; // pretend this is loaded with something
char remote_ip6[INET6_ADDRSTRLEN]; // space to hold the IPv6 string
struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)local_info; // pretend this is loaded with something
inet_ntop(AF_INET6, &(sa6->sin6_addr), ip6, INET6_ADDRSTRLEN);
u_int16_t tport = ntohs(sa6->sin6_port);
debug(1,"New RTSP connection at: %s:%u", ip6,tport);
sa6 = (struct sockaddr_in6*)&conn->remote; // pretend this is loaded with something
inet_ntop(AF_INET6, &(sa6->sin6_addr), remote_ip6, INET6_ADDRSTRLEN);
u_int16_t rport = ntohs(sa6->sin6_port);
debug(1,"New RTSP connection from [%s]:%u to self at [%s]:%u.",remote_ip6,rport,ip6,tport);
}
#endif
} else {
debug(1,"Error figuring out Shairport Sync's own ipnumber");
debug(1,"Error figuring out Shairport Sync's own IP number.");
}
usleep(500000);