- Unbreak ndmpd server on FreeBSD HEAD(12) and FreeBSD Stable(11).

araujobsd · araujobsd · commit ffde7d1aabcb · 2017-10-02T03:05:25.000+08:00
diff --git a/Makefile b/Makefile
@@ -30,11 +30,9 @@ TLM_SRCS = tlm/tlm_util.c \
 		  tlm/tlm_info.c \
 		  tlm/tlm_hardlink.c
 
-#LDADD =	-lmd -lpthread -lc
-LDADD =	-lmd -lpthread -lc -lzfs -lzfs_core -lnvpair -lumem -lbsm
+LDADD =	-lmd -lpthread -lc
 MAN=
 CFLAGS += -I. -I./include 
-CFLAGS+= -DEMC_MODEL
 		   
 PREFIX ?= /usr/local
 DSTDIR = ${PREFIX}/sbin 
diff --git a/include/ndmp.h b/include/ndmp.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -1259,7 +1260,7 @@ typedef enum ndmp_connect_reason ndmp_connect_reason;
 struct ndmp_notify_connected_request {
 	ndmp_connect_reason reason;
 	u_short protocol_version;
-	const char *text_reason;
+	char *text_reason;
 };
 typedef struct ndmp_notify_connected_request ndmp_notify_connected_request;
 
diff --git a/include/ndmp.x b/include/ndmp.x
@@ -1,6 +1,7 @@
 /*
  * Copyright 1996, 1997 PDC, Network Appliance.
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2015 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
diff --git a/include/ndmpd.h b/include/ndmpd.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
- * Copyright 2015 Marcelo Araujo <araujo@FreeBSD.org>.
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -47,7 +47,6 @@
 #include <sys/socket.h>
 #include <string.h> /* memset */
 #include <unistd.h> /* close */
-#include <stdio.h>
 
 /* free() */
 #include <stdlib.h>
@@ -319,6 +318,5 @@ int ndmp_run(u_long port, ndmp_con_handler_func_t con_handler_func);
 void connection_handler(ndmp_connection_t *connection);
 bool_t file_exists(const char * filename);
 int startNDMPD(void);
-static char * getline_ndmpd(FILE *fp, char *line, int llen);
 
 #endif /* _NDMPD_H_ */
diff --git a/include/ndmpd_fhistory.h b/include/ndmpd_fhistory.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -60,6 +61,5 @@ int ndmpd_fhnode_v3_cb(lbr_fhlog_call_backs_t *cbp, char *dir, char *file,
 	struct stat *stp, u_longlong_t off);
 int ndmpd_path_restored_v3(lbr_fhlog_call_backs_t *cbp, char *name,
 	struct stat *st, u_longlong_t ll_idx);
-char *get_bk_path_v3(ndmpd_module_params_t *params);
 
 #endif /* _NDMPD_FHISTORY_H */
diff --git a/include/ndmpd_prop.h b/include/ndmpd_prop.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -123,8 +124,6 @@ int ndmpd_load_prop(const char *);
 char *ndmpd_get_prop(ndmpd_cfg_id_t id);
 char *ndmpd_get_prop_default(ndmpd_cfg_id_t id, char *dflt);
 int ndmpd_get_prop_yorn(ndmpd_cfg_id_t id);
-void print_prop(void);
-void setup(char *line);
 
 #ifdef	__cplusplus
 }
diff --git a/include/ndmpd_tar_v3.h b/include/ndmpd_tar_v3.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -55,7 +56,6 @@
 
 extern bool_t ndmp_ignore_ctime;
 extern bool_t ndmp_include_lmtime;
-extern int multiple_dest_restore;
 
 /* Defined */
 ndmp_error ndmp_restore_get_params_v3(ndmpd_session_t *session,
@@ -67,7 +67,5 @@ int ndmp_send_recovery_stat_v3(ndmpd_module_params_t *params,
 
 void setWriteBufDone(tlm_buffers_t *bufs);
 void setReadBufDone(tlm_buffers_t *bufs);
-char ** setupsels(ndmpd_session_t *session, ndmpd_module_params_t *params,
-	ndmp_lbr_params_t *nlp, int index);
 
 #endif /* _NDMPD_TAR_V3_ */
diff --git a/include/ndmpd_util.h b/include/ndmpd_util.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -65,11 +66,6 @@
 #define	IN_ADDR(x) \
 	(*(struct in_addr *)&x)
 
-/* 
- * Mutex to protect Nlp 
- */ 
-extern mutex_t nlp_mtx;
-
 /* defined in ndmpd_func */
 extern int ndmp_full_restore_path;
 extern int ndmp_ver;
@@ -108,7 +104,7 @@ void ndmp_session_ref(ndmpd_session_t *session);
 void ndmp_session_unref(ndmpd_session_t *session);
 
 char *ndmp_new_job_name(char *jname);
-int ndmp_get_cur_bk_time(ndmp_lbr_params_t *nlp, time_t *tp);
+int ndmp_get_cur_bk_time(ndmp_lbr_params_t *nlp, time_t *tp, char *jname);
 long ndmp_buffer_get_size(ndmpd_session_t *session);
 void ndmpd_get_file_entry_type(int mode, ndmp_file_type *ftype);
 char *ndmp_get_relative_path(char *base, char *fullpath);
@@ -120,7 +116,7 @@ void ndmp_lbr_cleanup(ndmpd_session_t *session);
 
 bool_t ndmp_valid_v3addr_type(ndmp_addr_type type);
 int ndmp_connect_sock_v3(u_long addr, u_short port);
-const char **ndmpd_make_exc_list(void);
+char **ndmpd_make_exc_list(void);
 
 bool_t fs_is_valid_logvol(char *path);
 char *ndmpd_mk_temp(char *buf);
@@ -149,7 +145,7 @@ void ndmp_copy_addr_v4(ndmp_addr_v4 *dst, ndmp_addr_v4 *src);
 int ndmp_lbr_init(ndmpd_session_t *session);
 void ndmp_copy_addr_v3(ndmp_addr_v3 *dst, ndmp_addr_v3 *src);
 
-const char *cctime(time_t *t);
+char *cctime(time_t *t);
 
 char *ndmp_base64_encode(char *);
 char *ndmp_base64_decode(char *);
diff --git a/include/tlm_util.h b/include/tlm_util.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -69,6 +70,7 @@ int cstack_pop(cstack_t *stk, void **data, int *len);
 int cstack_top(cstack_t *stk, void **data, int *len);
 bool_t match(char *patn, char *str);
 int match_ci(char *patn, char *str);
+static bool_t parse_match(char line, char *seps);
 char *parse(char **line, char *seps);
 int oct_atoi(char *p);
 char *strupr(char *s);
diff --git a/out/test_tool/ndmpc b/out/test_tool/ndmpc
diff --git a/src/ndmp_xdr.c b/src/ndmp_xdr.c
@@ -1729,7 +1729,7 @@ xdr_ndmp_notify_connected_request(XDR *xdrs, ndmp_notify_connected_request *objp
 		return (FALSE);
 	if (!xdr_u_short(xdrs, &objp->protocol_version))
 		return (FALSE);
-	if (!xdr_string(xdrs, (void *)&objp->text_reason, ~0))
+	if (!xdr_string(xdrs, &objp->text_reason, ~0))
 		return (FALSE);
 	return (TRUE);
 }
diff --git a/src/ndmpd.c b/src/ndmpd.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -40,8 +41,6 @@
  */
 
 #include <stdio.h>
-#include <signal.h>
-#include <assert.h>
 
 /* getopt */
 #include <unistd.h>
@@ -54,10 +53,14 @@
 #include <ndmpd_table.h>
 #include <ndmpd_prop.h>
 
+#include <signal.h>
+#include <assert.h>
+
 /* for print log function */
 #include <stdarg.h>
 
 extern void ndmpd_mover_cleanup(ndmpd_session_t *session);
+
 extern ndmp_connection_t *ndmp_create_xdr_connection(void);
 extern void ndmp_destroy_xdr_connection(ndmp_connection_t *);
 extern void *ndmp_malloc(size_t size);
@@ -81,12 +84,11 @@ ndmpd_log(int level, const char *fmt,...)
 {
 	va_list arg;
 	va_start(arg, fmt);
-
-	if (PRINT_DEBUG_LOG) {
+	if (PRINT_DEBUG_LOG){
 		vfprintf(stderr, fmt, arg);
 		fprintf(stderr, "\n");
-	} else {
-		if (level != LOG_DEBUG) {
+	}else{
+		if(level!=LOG_DEBUG){
 			vfprintf(stderr, fmt, arg);
 			fprintf(stderr, "\n");
 		}
@@ -164,11 +166,11 @@ ndmp_run(u_long port, ndmp_con_handler_func_t con_handler_func)
 	sin.sin_family = AF_INET;
 
 	listenIP = getIPfromNIC(ndmpd_get_prop(NDMP_LISTEN_NIC));
-	printf("Management on IP: %s\n", listenIP);
-	if (strcmp(ndmpd_get_prop(NDMP_SERVE_NIC),"") == 0)
-		printf("Data Transfer on IP: %s\n",getIPfromNIC(ndmpd_get_prop(NDMP_LISTEN_NIC)));
+	printf("listen on IP: %s\n",listenIP);
+	if(strcmp(ndmpd_get_prop(NDMP_SERVE_NIC),"")==0)
+		printf(" Serve on IP: %s\n",getIPfromNIC(ndmpd_get_prop(NDMP_LISTEN_NIC)));
 	else
-		printf("Data Transfer on IP: %s\n",getIPfromNIC(ndmpd_get_prop(NDMP_SERVE_NIC)));
+		printf(" Serve on IP: %s\n",getIPfromNIC(ndmpd_get_prop(NDMP_SERVE_NIC)));
 
 	sin.sin_addr.s_addr = inet_addr(listenIP);
 	sin.sin_port = htons(port);
@@ -207,9 +209,9 @@ ndmp_run(u_long port, ndmp_con_handler_func_t con_handler_func)
 		 *
 		 * */
 		childPID = fork();
-		if (childPID >= 0) // fork was successful
+		if(childPID >= 0) // fork was successful
 		{
-			if (childPID == 0) {
+			if(childPID == 0) {
 				close(server_socket);
 
 				ndmpd_log(LOG_DEBUG, "connection fd: %d, got socket, start to process", ns);
@@ -220,7 +222,7 @@ ndmp_run(u_long port, ndmp_con_handler_func_t con_handler_func)
 				if ((argp = ndmp_malloc(sizeof (ndmpd_worker_arg_t))) != NULL) {
 					argp->nw_sock = ns;
 					argp->nw_ipaddr = ipaddr;
-					/* assign handler function  */
+					/*	assign handler function 	*/
 					argp->nw_con_handler_func = con_handler_func;
 					ndmpd_worker(argp);
 				}
@@ -249,7 +251,7 @@ void
 connection_handler(ndmp_connection_t *connection)
 {
 	ndmpd_log(LOG_DEBUG, " - connection_handler: handle the connection START - %d",
-		connection->conn_sock);
+						connection->conn_sock);
 	static int conn_id = 1;
 	ndmpd_session_t session;
 	ndmp_notify_connected_request req;
@@ -290,7 +292,7 @@ connection_handler(ndmp_connection_t *connection)
 
 	req.reason = NDMP_CONNECTED;
 	req.protocol_version = ndmp_ver;
-	req.text_reason = ""; 
+	req.text_reason = (char *)""; 
 
 	/* Send request to tell the client that we're ready for connection */
 	if (ndmp_send_request_lock(connection, 
@@ -429,3 +431,5 @@ main(int argc, char *argv[])
 	
 	return 0;
 }
+
+
diff --git a/src/ndmpd_dtime.c b/src/ndmpd_dtime.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -274,7 +275,7 @@ ddates_pathname(char *buf)
 }
 
 /*
- * getline_ndmpd
+ * getline
  *
  * Get a line from the file and handle the continued lines.
  */
diff --git a/src/ndmpd_info.c b/src/ndmpd_info.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -245,8 +246,6 @@ ndmpd_config_get_butype_info_v3(ndmp_connection_t *connection, void *body)
 	NDMP_SETENV(envp, "FILESYSTEM", "");
 	NDMP_SETENV(envp, "UPDATE", "");
 	NDMP_SETENV(envp, "HIST", "n");
-	NDMP_SETENV(envp, "QNAP_EFILE0", "");
-	NDMP_SETENV(envp, "QNAP_EDIR0", "");
 	NDMP_SETENV(envp, "FILES", "");
 	NDMP_SETENV(envp, "SNAPSURE", "NO");
 	NDMP_SETENV(envp, "LEVEL", "0");
@@ -571,8 +570,6 @@ ndmpd_config_get_butype_info_v4(ndmp_connection_t *connection, void *body)
 	NDMP_SETENV(envp, "FILESYSTEM", "");
 	NDMP_SETENV(envp, "UPDATE", "");
 	NDMP_SETENV(envp, "HIST", "n");
-	NDMP_SETENV(envp, "QNAP_EFILE0", "");
-	NDMP_SETENV(envp, "QNAP_EDIR0", "");
 	NDMP_SETENV(envp, "FILES", "");
 	NDMP_SETENV(envp, "SNAPSURE", "NO");
 	NDMP_SETENV(envp, "LEVEL", "0");
diff --git a/src/ndmpd_prop.c b/src/ndmpd_prop.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  
+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.
  * All rights reserved.
  *
  * Use is subject to license terms.
@@ -51,7 +52,7 @@
 #include "ndmpd.h"
 
 typedef struct ndmpd_cfg_param {
-	const char		*name;
+	char		*name;
 	char		value[64+1];
 } ndmpd_cfg_param_t;
 
@@ -64,7 +65,6 @@ typedef struct ndmpd_cfg_param {
  * 4. serve-ip
  *
  * */
-static
 ndmpd_cfg_param_t ndmpd_cfg_table[] =
 {
 	{"listen-nic", ""},
@@ -106,8 +106,7 @@ void print_prop(){
  * config table.
  */
 void setup(char *line){
-	int ki,vi,iskey;
-	unsigned long idx;
+	int ki,vi,idx,iskey;
 	char key[64];
 	char value[64+1];
 	ndmpd_cfg_id_t id;
@@ -176,6 +175,7 @@ char *
 ndmpd_get_prop(ndmpd_cfg_id_t id)
 {
 	char *env_val;
+	int i=0;
 
 	if (id < NDMP_MAXALL) {
 		env_val = ndmpd_cfg_table[id].value;
diff --git a/src/ndmpd_tar_v3.c b/src/ndmpd_tar_v3.c
diff --git a/src/ndmpd_util.c b/src/ndmpd_util.c
diff --git a/tlm/tlm_backup_reader.c b/tlm/tlm_backup_reader.c
diff --git a/tlm/tlm_lib.c b/tlm/tlm_lib.c
diff --git a/tlm/tlm_restore_writer.c b/tlm/tlm_restore_writer.c

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* Copyright 1996, 1997 PDC, Network Appliance.`
`3`	`3`	`* Copyright 2009 Sun Microsystems, Inc.`
	`4`	`+ * Copyright 2015 Marcelo Araujo <araujo@FreeBSD.org>.`
`4`	`5`	`* All rights reserved.`
`5`	`6`	`*`
`6`	`7`	`* Use is subject to license terms.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* Copyright 2009 Sun Microsystems, Inc.`
	`3`	`+ * Copyright 2017 Marcelo Araujo <araujo@FreeBSD.org>.`
`3`	`4`	`* All rights reserved.`
`4`	`5`	`*`
`5`	`6`	`* Use is subject to license terms.`
`@@ -123,8 +124,6 @@ int ndmpd_load_prop(const char *);`
`123`	`124`	`char *ndmpd_get_prop(ndmpd_cfg_id_t id);`
`124`	`125`	`char ndmpd_get_prop_default(ndmpd_cfg_id_t id, char dflt);`
`125`	`126`	`int ndmpd_get_prop_yorn(ndmpd_cfg_id_t id);`
`126`		`-void print_prop(void);`
`127`		`-void setup(char *line);`
`128`	`127`
`129`	`128`	`#ifdef __cplusplus`
`130`	`129`	`}`