Osmocom Open Build Service

osmo-pcap.spec Changed

commit_38016e40c3d318382ff1da689d2b7fc9992f69c8.txt Added

commit_b657ea9b8d41e18bc0a9095ed6238bd617b75c87.txt Deleted

osmo-pcap_0.5.0.49.b657e.dsc -> osmo-pcap_0.5.0.52.3801.dsc Changed

osmo-pcap_0.5.0.49.b657e.tar.xz/.tarball-version -> osmo-pcap_0.5.0.52.3801.tar.xz/.tarball-version Changed

osmo-pcap_0.5.0.49.b657e.tar.xz/debian/changelog -> osmo-pcap_0.5.0.52.3801.tar.xz/debian/changelog Changed

osmo-pcap_0.5.0.49.b657e.tar.xz/include/osmo-pcap/osmo_pcap_server.h -> osmo-pcap_0.5.0.52.3801.tar.xz/include/osmo-pcap/osmo_pcap_server.h Changed

osmo-pcap_0.5.0.49.b657e.tar.xz/src/osmo_server_main.c -> osmo-pcap_0.5.0.52.3801.tar.xz/src/osmo_server_main.c Changed

osmo-pcap_0.5.0.49.b657e.tar.xz/src/osmo_server_network.c -> osmo-pcap_0.5.0.52.3801.tar.xz/src/osmo_server_network.c Changed

@@ -462,13 +462,15 @@
 
 static int accept_cb(struct osmo_fd *fd, unsigned int when)
 {
-	struct osmo_pcap_conn *conn;
+	struct osmo_pcap_conn *conn = NULL;
 	struct osmo_pcap_server *server;
-	struct sockaddr_in addr;
-	socklen_t size = sizeof(addr);
+	char strINET6_ADDRSTRLEN;
+	struct osmo_sockaddr osa;
+	socklen_t len = sizeof(osa.u.sas);
 	int new_fd;
 
-	new_fd = accept(fd->fd, (struct sockaddr *) &addr, &size);
+	memset(&osa, 0, sizeof(osa));
+	new_fd = accept(fd->fd, &osa.u.sa, &len);
 	if (new_fd < 0) {
 		LOGP(DSERVER, LOGL_ERROR, "Failed to accept socket: %d\n", errno);
 		return -1;
@@ -480,13 +482,20 @@
 	rate_ctr_inc2(server->ctrg, SERVER_CTR_CONNECT);
 
 	llist_for_each_entry(conn, &server->conn, entry) {
-		if (conn->remote_addr.s_addr == addr.sin_addr.s_addr) {
-			LOGP(DSERVER, LOGL_NOTICE,
-			     "New connection from %s\n", conn->name);
-			osmo_pcap_conn_event(conn, "connect", NULL);
-			new_connection(server, conn, new_fd);
-			return 0;
-		}
+		if (conn->rem_addr.u.sa.sa_family != osa.u.sa.sa_family)
+			continue;
+		switch (conn->rem_addr.u.sa.sa_family) {
+		case AF_INET:
+			if (conn->rem_addr.u.sin.sin_addr.s_addr != osa.u.sin.sin_addr.s_addr)
+				continue;
+			goto found;
+		case AF_INET6:
+			if (memcmp(&conn->rem_addr.u.sin6.sin6_addr, &osa.u.sin6.sin6_addr, sizeof(struct in6_addr)))
+				continue;
+			goto found;
+		default:
+			continue;
+		};
 	}
 
 	rate_ctr_inc2(server->ctrg, SERVER_CTR_NOCLIENT);
@@ -496,10 +505,16 @@
 	 * this client.
 	 */
 
-	LOGP(DSERVER, LOGL_ERROR,
-	     "Failed to find client for %s\n", inet_ntoa(addr.sin_addr));
+	LOGP(DSERVER, LOGL_ERROR, "Failed to find client for %s\n",
+	     osmo_sockaddr_ntop(&osa.u.sa, str));
 	close(new_fd);
 	return -1;
+
+found:
+	LOGP(DSERVER, LOGL_NOTICE, "New connection from %s\n", conn->name);
+	osmo_pcap_conn_event(conn, "connect", NULL);
+	new_connection(server, conn, new_fd);
+	return 0;
 }
 
 int osmo_pcap_server_listen(struct osmo_pcap_server *server)

osmo-pcap_0.5.0.49.b657e.tar.xz/src/osmo_server_vty.c -> osmo-pcap_0.5.0.52.3801.tar.xz/src/osmo_server_vty.c Changed

osmo-pcap_0.5.0.49.b657e.tar.xz/tests/rotate_localtime/Makefile.am -> osmo-pcap_0.5.0.52.3801.tar.xz/tests/rotate_localtime/Makefile.am Changed

Changes of Revision 31