X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=7c93b91722649a2a5386db892d444702025b07bd;hp=48b46da44e73768335724790a2cb973459dd66de;hb=2d8f0c21ac8735fc06d1aa88e7873614392e3042;hpb=ce2bb6c458275ec6c0a115a2c814a15761474f11

diff --git a/client_common.c b/client_common.c
index 48b46da4..7c93b917 100644
--- a/client_common.c
+++ b/client_common.c
@@ -1,24 +1,16 @@
 /*
  * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file client_common.c common functions of para_client and para_audiod */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
+#include "error.h"
 #include "list.h"
 #include "sched.h"
 #include "client.cmdline.h"
@@ -29,7 +21,6 @@
 #include "string.h"
 #include "client.cmdline.h"
 #include "client.h"
-#include "error.h"
 
 /*
  * rc4 encrypt data before sending
@@ -81,6 +72,7 @@ void client_close(struct private_client_data *pcd)
 	free(pcd->user);
 	free(pcd->config_file);
 	free(pcd->key_file);
+	client_cmdline_parser_free(&pcd->conf);
 	free(pcd);
 }
 
@@ -95,13 +87,13 @@ static int client_connect(struct private_client_data *pcd)
 	if (ret < 0)
 		return ret;
 	/* get new socket */
-	ret = get_socket();
+	ret = get_stream_socket(AF_INET);
 	if (ret < 0)
 		return ret;
 	pcd->fd = ret;
 	/* init their_addr */
 	init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
-	ret = para_connect(pcd->fd, &their_addr);
+	ret = PARA_CONNECT(pcd->fd, &their_addr);
 	if (ret < 0)
 		goto err_out;
 	pcd->status = CL_CONNECTED;
@@ -164,9 +156,16 @@ int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr)
 		ret = -E_NO_CONFIG;
 		goto out;
 	}
-	if (!ret)
-		client_cmdline_parser_configfile(pcd->config_file,
-			&pcd->conf, 0, 0, 0);
+	if (!ret) {
+		struct client_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		client_cmdline_parser_config_file(pcd->config_file,
+			&pcd->conf, &params);
+	}
 	ret = 1;
 	PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg);
 	PARA_INFO_LOG("config_file: %s\n", pcd->config_file);
@@ -179,6 +178,7 @@ out:
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 		client_close(pcd);
+		*pcd_ptr = NULL;
 	}
 	return ret;
 }