*** ../orig/dsniff-2.4/dsniff.c	Thu Mar 15 03:33:03 2001
--- dsniff.c	Tue Feb 17 23:08:01 2004
***************
*** 47,52 ****
  {
  	fprintf(stderr, "Version: " VERSION "\n"
! 		"Usage: dsniff [-cdmn] [-i interface] [-s snaplen] [-f services]\n"
! 		"              [-t trigger[,...]] [-r|-w savefile] [expression]\n");
  	exit(1);
  }
--- 47,53 ----
  {
  	fprintf(stderr, "Version: " VERSION "\n"
! 		"Usage: dsniff [-cdmn] [-i interface | -p pcap dump file] [-s snaplen]\n"
! 		"              [-f services] [-t trigger[,...]] [-r|-w savefile]\n"
! 		"              [expression]\n");
  	exit(1);
  }
***************
*** 80,84 ****
  	services = savefile = triggers = NULL;
  	
! 	while ((c = getopt(argc, argv, "cdf:i:mnr:s:t:w:h?V")) != -1) {
  		switch (c) {
  		case 'c':
--- 81,85 ----
  	services = savefile = triggers = NULL;
  	
! 	while ((c = getopt(argc, argv, "cdf:i:mnp:r:s:t:w:h?V")) != -1) {
  		switch (c) {
  		case 'c':
***************
*** 100,103 ****
--- 101,107 ----
  			Opt_dns = 0;
  			break;
+ 		case 'p':
+ 			nids_params.filename = optarg;
+ 			break;
  		case 'r':
  			Opt_read = 1;
***************
*** 169,176 ****
  	
  	if (nids_params.pcap_filter != NULL) {
! 		warnx("listening on %s [%s]", nids_params.device,
! 		      nids_params.pcap_filter);
  	}
- 	else warnx("listening on %s", nids_params.device);
  	
  	nids_run();
--- 173,193 ----
  	
  	if (nids_params.pcap_filter != NULL) {
! 		if (nids_params.filename == NULL) {
! 			warnx("listening on %s [%s]", nids_params.device,
! 		        nids_params.pcap_filter);
! 		}
! 		else {
! 			warnx("using %s [%s]", nids_params.filename,
! 		        nids_params.pcap_filter);
! 		}
! 	}
! 	else {
! 		if (nids_params.filename == NULL) {
! 			warnx("listening on %s", nids_params.device);
! 		}
! 		else {
! 			warnx("using %s", nids_params.filename);
! 		}
  	}
  	
  	nids_run();