/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 plugin-runner.c

  • Committer: Teddy Hogeborn
  • Date: 2009-09-21 21:39:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090921213925-jbpt6tzu99otseng
Use D-Bus properties instead of our own methods.

* mandos (Client._datetime_to_milliseconds): Renamed to
                                             "_timedelta_to_milliseconds".
                                             All callers changed.
  (dbus_service_property): New decorator for D-Bus properties.
  (DBusPropertyException, DBusPropertyAccessException,
  DBusPropertyNotFound): New D-Bus exception classes.
  (DBusObjectWithProperties): New; extends "dbus.service.Object" with
                              support for properties.
  (ClientDBus): Inherit from, and call up to, "DBusObjectWithProperties".
  (ClientDBus.CheckedOK, ClientDBus.GetAllProperties,
  ClientDBus.SetChecker, ClientDBus.SetHost, ClientDBus.SetInterval,
  ClientDBus.SetSecret, ClientDBus.SetTimeout, ClientDBus.Enable,
  ClientDBus.StartChecker, ClientDBus.Disable,
  ClientDBus.StopChecker): Removed, replaced with properties.
  (ClientDBus.IsStillValid): Removed, superfluous.
  (ClientDBus.name_dbus_property,
  ClientDBus.fingerprint_dbus_property, ClientDBus.host_dbus_property,
  ClientDBus.created_dbus_property,
  ClientDBus.last_enabled_dbus_property,
  ClientDBus.enabled_dbus_property,
  ClientDBus.last_checked_ok_dbus_property,
  ClientDBus.timeout_dbus_property, ClientDBus.interval_dbus_property,
  ClientDBus.checker_dbus_property,
  ClientDBus.checker_running_dbus_property,
  ClientDBus.object_path_dbus_property,
  ClientDBus.secret_dbus_property): New D-Bus properties.

Show diffs side-by-side

added added

removed removed

Lines of Context:
968
968
      goto fallback;
969
969
    }
970
970
    
971
 
    FD_SET(new_plugin->fd, &rfds_all);
 
971
    FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
 
972
                                          -Wconversion */
972
973
    
973
974
    if(maxfd < new_plugin->fd){
974
975
      maxfd = new_plugin->fd;
1028
1029
          }
1029
1030
          
1030
1031
          /* Remove the plugin */
1031
 
          FD_CLR(proc->fd, &rfds_all);
 
1032
          FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
 
1033
                                          -Wconversion */
1032
1034
          
1033
1035
          /* Block signal while modifying process_list */
1034
1036
          ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1074
1076
      }
1075
1077
      
1076
1078
      /* This process has not completed.  Does it have any output? */
1077
 
      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
 
1079
      if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
 
1080
                                                         warning from
 
1081
                                                         -Wconversion */
1078
1082
        /* This process had nothing to say at this time */
1079
1083
        proc = proc->next;
1080
1084
        continue;