/* a generic logging routine for send/recv, with parameter
substitiution */
-static void log_formatted(char *op, struct file_struct *file)
+static void log_formatted(int fd,
+ char *format, char *op, struct file_struct *file,
+ struct stats *initial_stats)
{
extern int module_id;
extern char *auth_user;
char buf[1024];
+ char buf2[1024];
char *p, *s, *n;
- char buf2[100];
int l;
+ extern struct stats stats;
+ extern int am_sender;
+ int64 b;
- strlcpy(buf, lp_log_format(module_id), sizeof(buf)-1);
+ strlcpy(buf, format, sizeof(buf)-1);
for (s=&buf[0];
s && (p=strchr(s,'%')); ) {
n = buf2;
break;
case 'o': n = op; break;
- case 'f': n = f_name(file); break;
+ case 'f':
+ slprintf(buf2, sizeof(buf2)-1, "%s/%s",
+ file->basedir?file->basedir:"",
+ f_name(file));
+ clean_fname(buf2);
+ n = buf2;
+ if (*n == '/') n++;
+ break;
case 'm': n = lp_name(module_id); break;
+ case 't': n = timestring(time(NULL)); break;
case 'P': n = lp_path(module_id); break;
case 'u': n = auth_user; break;
+ case 'b':
+ if (am_sender) {
+ b = stats.total_written -
+ initial_stats->total_written;
+ } else {
+ b = stats.total_read -
+ initial_stats->total_read;
+ }
+ slprintf(buf2,sizeof(buf2)-1,"%.0f", (double)b);
+ n = buf2;
+ break;
+ case 'c':
+ if (!am_sender) {
+ b = stats.total_written -
+ initial_stats->total_written;
+ } else {
+ b = stats.total_read -
+ initial_stats->total_read;
+ }
+ slprintf(buf2,sizeof(buf2)-1,"%.0f", (double)b);
+ n = buf2;
+ break;
}
if (!n) continue;
s = p+l;
}
- rprintf(FLOG,"%s\n", buf);
+ rprintf(fd,"%s\n", buf);
}
/* log the outgoing transfer of a file */
-void log_send(struct file_struct *file)
+void log_send(struct file_struct *file, struct stats *initial_stats)
{
extern int module_id;
+ extern int am_server;
+ extern char *log_format;
+
if (lp_transfer_logging(module_id)) {
- log_formatted("send", file);
+ log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats);
+ } else if (log_format && !am_server) {
+ log_formatted(FINFO, log_format, "send", file, initial_stats);
}
}
/* log the incoming transfer of a file */
-void log_recv(struct file_struct *file)
+void log_recv(struct file_struct *file, struct stats *initial_stats)
{
extern int module_id;
+ extern int am_server;
+ extern char *log_format;
+
if (lp_transfer_logging(module_id)) {
- log_formatted("recv", file);
+ log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats);
+ } else if (log_format && !am_server) {
+ log_formatted(FINFO, log_format, "send", file, initial_stats);
}
}
}
/* log the incoming transfer of a file for interactive use, this
- will be called at the end where the client was run */
+ will be called at the end where the client was run
+
+ it i called when a file starts to be transferred
+*/
void log_transfer(struct file_struct *file, char *fname)
{
extern int verbose;