← Back to branch summary

~ubuntu-branches/ubuntu/raring/ntop/raring-proposed

« back to all changes in this revision

Viewing changes to prefs.c

  • Committer: Package Import Robot
  • Author(s): Ludovico Cavedon
  • Date: 2012-06-27 00:24:42 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120627002442-9ljq6fhjqzx9qsu6
Tags: 3:4.99.3+ndpi5517+dfsg1-1
* Imported Upstream version 4.99.3 and nDPI r5517.
* get-orig-source.sh: incude nDPI in the orig tarball.
* No longer suggest ntop-graphs and update NEWS about that.
* Update copyright for the new jqPlot library.
* Refresh patches.
* Enable hardening flags.
* Add install-jqplot.patch to install jqPlot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
prefs.c
95
95
  { "pcap-log",                         required_argument, NULL, 'l' },
96
96
  { "local-subnets",                    required_argument, NULL, 'm' },
97
97
  { "numeric-ip-addresses",             required_argument, NULL, 'n' },
98
 
  { "no-mac",                           no_argument,       NULL, 'o' },
 
98
  /* 'o' is free */
99
99
 
100
100
  { "protocols",                        required_argument, NULL, 'p' },
101
101
  { "create-suspicious-packets",        no_argument,       NULL, 'q' },
159
159
  { "disable-stopcap",                  no_argument,       NULL, 142 },
160
160
  { "disable-instantsessionpurge",      no_argument,       NULL, 144 },
161
161
  { "disable-mutexextrainfo",           no_argument,       NULL, 145 },
162
 
 
 
162
  { "disable-ndpi",                     no_argument,       NULL, 146 },
 
163
  { "disable-python",                   no_argument,       NULL, 147 },
 
164
  
163
165
  { "skip-version-check",               required_argument, NULL, 150 },
164
166
  { "known-subnets",                    required_argument, NULL, 151 },
165
167
 
714
716
      myGlobals.runningPref.disableMutexExtraInfo = TRUE;
715
717
      break;
716
718
 
 
719
    case 146: /* disable-ndpi */
 
720
      myGlobals.runningPref.disablenDPI = TRUE;
 
721
      break;
 
722
 
717
723
    case 147:
718
 
      myGlobals.runningPref.stickyHosts = TRUE;
 
724
      myGlobals.runningPref.disablePython = TRUE;
719
725
      break;
720
726
 
721
727
    case 150: