From 523373e162230670cd9ce8adc51c07ea204e6ad7 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@congo.fml.local>
Date: Fri, 9 Mar 2007 13:41:43 +0100
Subject: [PATCH] simplify dccp_set_socket() (Gerrit Renker)

This patch kills two unneccessary setsocketopt calls
and cleans up the resulting fallout.
---
 dccp.c  | 18 ++----------------
 error.h |  2 --
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/dccp.c b/dccp.c
index fa48976e..94cd7957 100644
--- a/dccp.c
+++ b/dccp.c
@@ -29,11 +29,8 @@
 #include "fd.h"
 
 /** \cond some magic dccp constants */
-#define SOL_DCCP 269
 #define SOCK_DCCP 6
 #define IPPROTO_DCCP 33
-#define DCCP_SOCKOPT_PACKET_SIZE 1
-#define DCCP_SOCKOPT_SERVICE 2
 /** \endcond */
 
 /**
@@ -58,18 +55,7 @@ int dccp_get_socket(void)
  *
  * \returns positive on success, negative on errors.
  */
-int dccp_set_socket(int fd)
+int dccp_set_socket(__a_unused int fd)
 {
-	int pkt_size = 256, ret;
-
-	/* hack to get a service code */
-	ret = setsockopt(fd, SOL_DCCP, DCCP_SOCKOPT_PACKET_SIZE,
-		(char*)&pkt_size, sizeof(pkt_size));
-	if (ret < 0)
-		return -E_DCCP_PACKET_SIZE;
-	ret = setsockopt(fd, SOL_DCCP, DCCP_SOCKOPT_SERVICE,
-		(char*)&pkt_size, sizeof(pkt_size));
-	if (ret < 0)
-		return -E_DCCP_SERVICE;
-	return 1;
+	return 1;	/* nothing to do at the moment */
 }
diff --git a/error.h b/error.h
index 45485e1d..e1007fd3 100644
--- a/error.h
+++ b/error.h
@@ -379,8 +379,6 @@ extern const char **para_errlist[];
 
 #define DCCP_ERRORS \
 	PARA_ERROR(DCCP_SOCKET, "can not create dccp socket"), \
-	PARA_ERROR(DCCP_PACKET_SIZE, "failed to set dccp packet size"), \
-	PARA_ERROR(DCCP_SERVICE, "could not get service code"), \
 	PARA_ERROR(DCCP_RECV_EOF, "dccp_recv: end of file"), \
 
 
-- 
2.39.2