/mandos/release

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

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2016-10-01 13:56:09 UTC
  • mfrom: (237.7.423 trunk)
  • Revision ID: teddy@recompile.se-20161001135609-y5q39hvf2d95utwf
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
626
626
                     safer_gnutls_strerror(ret));
627
627
        dhparamsfilename = NULL;
628
628
      }
629
 
      free(params.data);
630
629
    } while(false);
631
630
  }
632
631
  if(dhparamsfilename == NULL){
1079
1078
    bool match = false;
1080
1079
    {
1081
1080
      char *interface = NULL;
1082
 
      while((interface = argz_next(mc->interfaces,
1083
 
                                   mc->interfaces_size,
1084
 
                                   interface))){
 
1081
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
 
1082
                                 interface))){
1085
1083
        if(if_nametoindex(interface) == (unsigned int)if_index){
1086
1084
          match = true;
1087
1085
          break;
1494
1492
  return retval;
1495
1493
}
1496
1494
 
 
1495
__attribute__((nonnull))
1497
1496
static void resolve_callback(AvahiSServiceResolver *r,
1498
1497
                             AvahiIfIndex interface,
1499
1498
                             AvahiProtocol proto,
2196
2195
  
2197
2196
  /* Sleep checking until interface is running.
2198
2197
     Check every 0.25s, up to total time of delay */
2199
 
  for(int i = 0; i < delay * 4; i++){
 
2198
  for(int i=0; i < delay * 4; i++){
2200
2199
    if(interface_is_running(interface)){
2201
2200
      break;
2202
2201
    }
3023
3022
      /* Take down the network interfaces which were brought up */
3024
3023
      {
3025
3024
        char *interface = NULL;
3026
 
        while((interface = argz_next(interfaces_to_take_down,
3027
 
                                     interfaces_to_take_down_size,
3028
 
                                     interface))){
 
3025
        while((interface=argz_next(interfaces_to_take_down,
 
3026
                                   interfaces_to_take_down_size,
 
3027
                                   interface))){
3029
3028
          ret = take_down_interface(interface);
3030
3029
          if(ret != 0){
3031
3030
            errno = ret;