/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/splashy.c

  • Committer: Teddy Hogeborn
  • Date: 2009-02-13 05:38:21 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090213053821-03e696gckk4nbjps
Support not using IPv6 in server:

* mandos (AvahiService.__init__): Take new "protocol" parameter.  All
                                  callers changed.
  (IPv6_TCPServer.__init__): Take new "use_ipv6" parameter.  All
                             callers changed.
  (IPv6_TCPServer.server_bind): Create IPv4 socket if not using IPv6.
  (main): New "--no-ipv6" command line option.  New "use_ipv6" config
          option.
* mandos-options.xml ([@id="address"]): Document conditional IPv4
                                        address support.
  ([@id="ipv6"]): New paragraph.
* mandos.conf (use_ipv6): New config option.
* mandos.conf.xml (OPTIONS): Document new "use_dbus" option.
  (EXAMPLE): Changed to use IPv6 link-local address.  Added "use_ipv6"
             option.
* mandos.xml (SYNOPSIS): New "--no-ipv6" option.
  (OPTIONS): Document new "--no-ipv6" option.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/splashy.c
48
48
                                   WEXITSTATUS() */
49
49
 
50
50
sig_atomic_t interrupted_by_signal = 0;
51
 
int signal_received;
52
51
 
53
 
static void termination_handler(int signum){
54
 
  if(interrupted_by_signal){
55
 
    return;
56
 
  }
 
52
static void termination_handler(__attribute__((unused))int signum){
57
53
  interrupted_by_signal = 1;
58
 
  signal_received = signum;
59
54
}
60
55
 
61
56
int main(__attribute__((unused))int argc,
175
170
                     .sa_flags = 0 };
176
171
    sigemptyset(&new_action.sa_mask);
177
172
    sigaddset(&new_action.sa_mask, SIGINT);
178
 
    if(ret == -1){
179
 
      perror("sigaddset");
180
 
      free(prompt);
181
 
      return EXIT_FAILURE;
182
 
    }
183
173
    sigaddset(&new_action.sa_mask, SIGHUP);
184
 
    if(ret == -1){
185
 
      perror("sigaddset");
186
 
      free(prompt);
187
 
      return EXIT_FAILURE;
188
 
    }
189
174
    sigaddset(&new_action.sa_mask, SIGTERM);
190
 
    if(ret == -1){
191
 
      perror("sigaddset");
192
 
      free(prompt);
193
 
      return EXIT_FAILURE;
194
 
    }
195
175
    ret = sigaction(SIGINT, NULL, &old_action);
196
176
    if(ret == -1){
197
177
      perror("sigaction");