Merge remote-tracking branch 'upstream-git/master'

Conflicts:
	include/iscsi-private.h
	include/iscsi.h
	lib/connect.c
	lib/init.c
	lib/scsi-lowlevel.c

include/iscsi-private.h

@@ -130,7 +130,10 @@ struct iscsi_context {
 	int lun;
 	int no_auto_reconnect;
 	int reconnect_deferred;
-	int debug;
+	
+	int log_level;
+        iscsi_log_fn log_fn;
+
 	int mallocs;
 	int reallocs;
 	int frees;
@@ -309,6 +312,16 @@ void iscsi_set_noautoreconnect(struct iscsi_context *iscsi, int state);
 
 void iscsi_decrement_iface_rr(void);
 
+#define ISCSI_LOG(iscsi, level, format, args...) \
+	do { \
+		if (level <= iscsi->log_level && iscsi->log_fn) { \
+			iscsi_log_message(iscsi, level, format, ## args); \
+		} \
+	} while (0)
+
+void
+iscsi_log_message(struct iscsi_context *iscsi, int level, const char *format, ...);
+
 #ifdef __cplusplus
 }
 #endif

include/iscsi.h

@@ -533,7 +533,7 @@ iscsi_task_mgmt_target_cold_reset_async(struct iscsi_context *iscsi,
 
 struct iscsi_data {
        int size;
-       int alloc_size;
+       size_t alloc_size;
        unsigned char *data;
 };
 
@@ -956,7 +956,7 @@ EXTERN int scsi_task_add_data_in_buffer(struct scsi_task *task, int len, unsigne
  */
 EXTERN int
 iscsi_scsi_cancel_task(struct iscsi_context *iscsi,
-			struct scsi_task *task);
+		       struct scsi_task *task);
 
 /*
  * This function is used when you want to cancel all scsi tasks.
@@ -968,18 +968,6 @@ iscsi_scsi_cancel_task(struct iscsi_context *iscsi,
 EXTERN void
 iscsi_scsi_cancel_all_tasks(struct iscsi_context *iscsi);
 
-#define DPRINTF(iscsi,level,fmt,args...) \
-	do { \
-		if ((iscsi)->debug >= level) { \
-			fprintf(stderr,"libiscsi: "); \
-			fprintf(stderr, (fmt), ##args); \
-			if (iscsi->target_name[0]) { \
-				fprintf(stderr," [%s]",iscsi->target_name); \
-			} \
-			fprintf(stderr,"\n"); \
-		} \
-	} while (0);
-
 /*
  * This function is to set the debugging level where level is
  * 
@@ -989,9 +977,18 @@ iscsi_scsi_cancel_all_tasks(struct iscsi_context *iscsi);
  * 3  = user set variables
  * 4  = function calls
  * 5  = ...
+ * 10 = everything
  */
 EXTERN void
-iscsi_set_debug(struct iscsi_context *iscsi, int level);
+iscsi_set_log_level(struct iscsi_context *iscsi, int level);
+
+typedef void (*iscsi_log_fn)(int level, const char *mesage);
+
+/* Set the logging function to use */
+EXTERN void iscsi_set_log_fn(struct iscsi_context *iscsi, iscsi_log_fn fn);
+
+/* predefined log function that just writes to stderr */
+EXTERN void iscsi_log_to_stderr(int level, const char *message);
 
 /*
  * This function is to set the TCP_USER_TIMEOUT option. It has to be called after iscsi