X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=fb2eafc91530f59c2f48605ec7bbcad9a900abd7;hp=94719f0443c2081842c14e6e153262e551e2903c;hb=2b46607651851bdf22fe989796fda95cf7b11d1a;hpb=e9e826f4fb415c4225ff5934fe42572ffa3b5ebc

diff --git a/dccp_send.c b/dccp_send.c
index 94719f04..fb2eafc9 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -44,15 +44,46 @@ static void dccp_pre_select(int *max_fileno, fd_set *rfds,
 		para_fd_set(dss->listen_fd, rfds, max_fileno);
 }
 
+/**
+ * Query the TX CCID used on the sender-client half connection.
+ * \param sockfd Server socket descriptor to query (after accept(2)).
+ * \return CCID number > 0, -1 on error/incompatibility.
+ *
+ * NB: This feature is only available on Linux > 2.6.30; on older kernels
+ * ENOPROTOOPT ("Protocol not available") will be returned.
+ */
+static int dccp_get_tx_ccid(int sockfd)
+{
+	int tx_ccid;
+	socklen_t len = sizeof(tx_ccid);
+
+	if (getsockopt(sockfd, SOL_DCCP,
+		       DCCP_SOCKOPT_TX_CCID, &tx_ccid, &len) < 0) {
+		PARA_WARNING_LOG("DCCP_SOCKOPT_TX_CCID: %s\n", strerror(errno));
+		return -1;
+	}
+	return tx_ccid;
+}
+
 static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
 	struct sender_client *sc;
+	int tx_ccid;
 
 	if (dss->listen_fd < 0 || !FD_ISSET(dss->listen_fd, rfds))
 		return;
 	sc = accept_sender_client(dss);
 	if (!sc)
 		return;
+
+	/* If CCID identifiable, present client as <host>#<port>~<ccid> */
+	tx_ccid = dccp_get_tx_ccid(sc->fd);
+	if (tx_ccid != -1) {
+		char *tmp = make_message("%s~%d", sc->name, tx_ccid);
+
+		free(sc->name);
+		sc->name = tmp;
+	}
 	/*
 	 * Bypass unused CCID paths: the sender does not receive application data
 	 * from the client; by shutting down this unused communication path we can
@@ -109,12 +140,13 @@ static int dccp_com_allow(struct sender_command_data *scd)
  */
 static const char *dccp_list_available_ccids(void)
 {
-	uint8_t ccids[DCCP_MAX_HOST_CCIDS];
-	uint8_t nccids = sizeof(ccids), i, len;
 	/* Worst case length: n * 3 digits + n-1 spaces + '\0' */
 	static char list[DCCP_MAX_HOST_CCIDS * 4];
+	uint8_t *ccids;
+	int i, len, nccids;
 
-	if (dccp_available_ccids(ccids, &nccids) == NULL) {
+	nccids = dccp_available_ccids(&ccids);
+	if (nccids < 0) {
 		snprintf(list, sizeof(list), "Unable to query available CCIDs");
 	} else {
 		for (i = len = 0; i < nccids; i++)