X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=9309ac1f02dc63edcc7af2939686b10b6d9b0599;hp=b2c9c43a81ad356ec021373c12d5c764fa5b76f4;hb=6bab1680d9285d0cfc1a16978a1fcfb21b746bfe;hpb=d2a600590a2607d2bd729f3079aaec320efe7990

diff --git a/net.c b/net.c
index b2c9c43a..9309ac1f 100644
--- a/net.c
+++ b/net.c
@@ -157,9 +157,13 @@ int makesock(unsigned l3type, unsigned l4type, int passive,
 	/* Set up address hint structure */
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = l3type;
-	/* getaddrinfo does not really work well with SOCK_DCCP */
-	if (socktype == SOCK_DGRAM || socktype == SOCK_STREAM)
-		hints.ai_socktype = socktype;
+	hints.ai_socktype = socktype;
+	/* 
+	 * getaddrinfo does not support SOCK_DCCP, so for the sake of lookup
+	 * (and only then) pretend to be UDP.
+	 */
+	if (l4type == IPPROTO_DCCP)
+		hints.ai_socktype = SOCK_DGRAM;
 
 	/* only use addresses available on the host */
 	hints.ai_flags = AI_ADDRCONFIG;
@@ -724,10 +728,9 @@ int recv_cred_buffer(int fd, char *buf, size_t size)
  *
  * \return Positive if \a pattern was received, negative otherwise.
  *
- * This function creates a buffer of size \a bufsize and tries
- * to receive at most \a bufsize bytes from file descriptor \a fd.
- * If at least \p strlen(\a pattern) bytes were received, the beginning of
- * the received buffer is compared with \a pattern, ignoring case.
+ * This function tries to receive at most \a bufsize bytes from file descriptor
+ * \a fd. If at least \p strlen(\a pattern) bytes were received, the beginning
+ * of the received buffer is compared with \a pattern, ignoring case.
  *
  * \sa recv_buffer(), \sa strncasecmp(3).
  */
@@ -735,7 +738,7 @@ int recv_pattern(int fd, const char *pattern, size_t bufsize)
 {
 	size_t len = strlen(pattern);
 	char *buf = para_malloc(bufsize + 1);
-	int ret = -E_RECV_PATTERN, n = recv_buffer(fd, buf, bufsize);
+	int ret = -E_RECV_PATTERN, n = recv_buffer(fd, buf, bufsize + 1);
 
 	if (n < len)
 		goto out;