Set a progname to send with our command.

[dhcpcd-ui] / src / libdhcpcd / dhcpcd.h

diff --git a/src/libdhcpcd/dhcpcd.h b/src/libdhcpcd/dhcpcd.h
index 639918a5b9b89c1403ea0e1b6343a07c08d8ed9c..68f9a88eb1360d7cca647fd284dfb77b6613ee25 100644 (file)
--- a/src/libdhcpcd/dhcpcd.h
+++ b/src/libdhcpcd/dhcpcd.h
@@ -32,18 +32,26 @@
 
 #include <stdbool.h>
 
 
 #include <stdbool.h>
 

+#ifdef __cplusplus
+extern "C" {
+#endif
+

 #ifndef DHCPCD_SOCKET
 #define DHCPCD_SOCKET          "/var/run/dhcpcd.sock"
 #endif
 #ifndef DHCPCD_SOCKET
 #define DHCPCD_SOCKET          "/var/run/dhcpcd.sock"
 #endif

+#ifndef DHCPCD_UNPRIV_SOCKET
+#define DHCPCD_UNPRIV_SOCKET   "/var/run/dhcpcd.unpriv.sock"
+#endif

 
 #ifndef WPA_CTRL_DIR
 #define WPA_CTRL_DIR           "/var/run/wpa_supplicant"
 #endif
 
 
 #ifndef WPA_CTRL_DIR
 #define WPA_CTRL_DIR           "/var/run/wpa_supplicant"
 #endif
 

-#define DHCPCD_RETRYOPEN       1       /* seconds */
+#define DHCPCD_RETRYOPEN       100     /* milliseconds */

 #define DHCPCD_WI_HIST_MAX     10      /* Recall 10 scans for averages */
 
 #define DHCPCD_WI_HIST_MAX     10      /* Recall 10 scans for averages */
 

-#define IF_SSIDSIZE            33
+/* Each non printable byte of the SSID is represented as \000 */
+#define IF_SSIDSIZE            ((32 * 4) + 1)

 #define IF_BSSIDSIZE           64
 #define FLAGSIZE               64
 #define TYPESIZE               8
 #define IF_BSSIDSIZE           64
 #define FLAGSIZE               64
 #define TYPESIZE               8


@@ -61,6 +69,7 @@ typedef struct dhcpcd_wi_scan {
        DHCPCD_WI_AV quality;
        DHCPCD_WI_AV noise;
        DHCPCD_WI_AV level;
        DHCPCD_WI_AV quality;
        DHCPCD_WI_AV noise;
        DHCPCD_WI_AV level;

+       DHCPCD_WI_AV strength;

        char ssid[IF_SSIDSIZE];
        char flags[FLAGSIZE];
 } DHCPCD_WI_SCAN;
        char ssid[IF_SSIDSIZE];
        char flags[FLAGSIZE];
 } DHCPCD_WI_SCAN;


@@ -80,6 +89,8 @@ typedef struct dhcpcd_if {
        char *data;
        size_t data_len;
 
        char *data;
        size_t data_len;
 

+       char *last_message;
+

        struct dhcpcd_connection *con;
 } DHCPCD_IF;
 #else
        struct dhcpcd_connection *con;
 } DHCPCD_IF;
 #else


@@ -110,23 +121,28 @@ typedef struct dhcpcd_wi_hist {
        int quality;
        int noise;
        int level;
        int quality;
        int noise;
        int level;

+       int strength;

 } DHCPCD_WI_HIST;
 
 typedef struct dhcpcd_wpa {
        struct dhcpcd_wpa *next;
        char ifname[IF_NAMESIZE];
 } DHCPCD_WI_HIST;
 
 typedef struct dhcpcd_wpa {
        struct dhcpcd_wpa *next;
        char ifname[IF_NAMESIZE];

+       bool open;

        int command_fd;
        char *command_path;
        int listen_fd;
        char *listen_path;
        int command_fd;
        char *command_path;
        int listen_fd;
        char *listen_path;

-       int attached;
+       bool attached;

        struct dhcpcd_connection *con;
 } DHCPCD_WPA;
 
 typedef struct dhcpcd_connection {
        struct dhcpcd_connection *next;
        struct dhcpcd_connection *con;
 } DHCPCD_WPA;
 
 typedef struct dhcpcd_connection {
        struct dhcpcd_connection *next;

+       bool open;
+       bool privileged;

        int command_fd;
        int listen_fd;
        int command_fd;
        int listen_fd;

+       const char *progname;

 
        DHCPCD_IF *interfaces;
        DHCPCD_WPA *wpa;
 
        DHCPCD_IF *interfaces;
        DHCPCD_WPA *wpa;


@@ -136,6 +152,7 @@ typedef struct dhcpcd_connection {
        void *if_context;
        void (*status_cb)(struct dhcpcd_connection *, const char *, void *);
        void *status_context;
        void *if_context;
        void (*status_cb)(struct dhcpcd_connection *, const char *, void *);
        void *status_context;

+       bool wpa_started;

        void (*wi_scanresults_cb)(DHCPCD_WPA *, void *);
        void *wi_scanresults_context;
        void (*wpa_status_cb)(DHCPCD_WPA *, const char *, void *);
        void (*wi_scanresults_cb)(DHCPCD_WPA *, void *);
        void *wi_scanresults_context;
        void (*wpa_status_cb)(DHCPCD_WPA *, const char *, void *);


@@ -162,10 +179,12 @@ typedef void *DHCPCD_CONNECTION;
 
 DHCPCD_CONNECTION * dhcpcd_new(void);
 const char * dhcpcd_version(DHCPCD_CONNECTION *);
 
 DHCPCD_CONNECTION * dhcpcd_new(void);
 const char * dhcpcd_version(DHCPCD_CONNECTION *);

+void dhcpcd_set_progname(DHCPCD_CONNECTION *, const char *);
+const char * dhcpcd_get_progname(const DHCPCD_CONNECTION *);

 const char * dhcpcd_status(DHCPCD_CONNECTION *);
 const char * dhcpcd_cffile(DHCPCD_CONNECTION *);
 bool dhcpcd_realloc(DHCPCD_CONNECTION *, size_t);
 const char * dhcpcd_status(DHCPCD_CONNECTION *);
 const char * dhcpcd_cffile(DHCPCD_CONNECTION *);
 bool dhcpcd_realloc(DHCPCD_CONNECTION *, size_t);

-int dhcpcd_open(DHCPCD_CONNECTION *);
+int dhcpcd_open(DHCPCD_CONNECTION *, bool priv);

 void dhcpcd_close(DHCPCD_CONNECTION *);
 void dhcpcd_free(DHCPCD_CONNECTION *);
 void dhcpcd_set_if_callback(DHCPCD_CONNECTION *,
 void dhcpcd_close(DHCPCD_CONNECTION *);
 void dhcpcd_free(DHCPCD_CONNECTION *);
 void dhcpcd_set_if_callback(DHCPCD_CONNECTION *,


@@ -173,6 +192,7 @@ void dhcpcd_set_if_callback(DHCPCD_CONNECTION *,
 void dhcpcd_set_status_callback(DHCPCD_CONNECTION *,
     void (*)(DHCPCD_CONNECTION *, const char *, void *), void *);
 int dhcpcd_get_fd(DHCPCD_CONNECTION *);
 void dhcpcd_set_status_callback(DHCPCD_CONNECTION *,
     void (*)(DHCPCD_CONNECTION *, const char *, void *), void *);
 int dhcpcd_get_fd(DHCPCD_CONNECTION *);

+bool dhcpcd_privileged(DHCPCD_CONNECTION *);

 void dhcpcd_dispatch(DHCPCD_CONNECTION *);
 DHCPCD_IF * dhcpcd_interfaces(DHCPCD_CONNECTION *);
 DHCPCD_IF * dhcpcd_get_if(DHCPCD_CONNECTION *, const char *, const char *);
 void dhcpcd_dispatch(DHCPCD_CONNECTION *);
 DHCPCD_IF * dhcpcd_interfaces(DHCPCD_CONNECTION *);
 DHCPCD_IF * dhcpcd_get_if(DHCPCD_CONNECTION *, const char *, const char *);


@@ -180,7 +200,7 @@ DHCPCD_CONNECTION * dhcpcd_if_connection(DHCPCD_IF *);
 const char *dhcpcd_get_value(const DHCPCD_IF *, const char *);
 const char *dhcpcd_get_prefix_value(const DHCPCD_IF *, const char *,
     const char *);
 const char *dhcpcd_get_value(const DHCPCD_IF *, const char *);
 const char *dhcpcd_get_prefix_value(const DHCPCD_IF *, const char *,
     const char *);

-char * dhcpcd_if_message(const DHCPCD_IF *i);
+char * dhcpcd_if_message(DHCPCD_IF *i, bool *new_msg);

 
 ssize_t dhcpcd_command(DHCPCD_CONNECTION *, const char *, char **);
 ssize_t dhcpcd_command_arg(DHCPCD_CONNECTION *, const char *, const char *,
 
 ssize_t dhcpcd_command(DHCPCD_CONNECTION *, const char *, char **);
 ssize_t dhcpcd_command_arg(DHCPCD_CONNECTION *, const char *, const char *,


@@ -188,6 +208,7 @@ ssize_t dhcpcd_command_arg(DHCPCD_CONNECTION *, const char *, const char *,
 #define dhcpcd_rebind(c, i)    dhcpcd_command_arg((c), "-n", (i), NULL)
 #define dhcpcd_release(c, i)   dhcpcd_command_arg((c), "-k", (i), NULL)
 
 #define dhcpcd_rebind(c, i)    dhcpcd_command_arg((c), "-n", (i), NULL)
 #define dhcpcd_release(c, i)   dhcpcd_command_arg((c), "-k", (i), NULL)
 

+void dhcpcd_wpa_start(DHCPCD_CONNECTION *);

 DHCPCD_WPA *dhcpcd_wpa_find(DHCPCD_CONNECTION *, const char *);
 DHCPCD_WPA *dhcpcd_wpa_new(DHCPCD_CONNECTION *, const char *);
 DHCPCD_CONNECTION *dhcpcd_wpa_connection(DHCPCD_WPA *);
 DHCPCD_WPA *dhcpcd_wpa_find(DHCPCD_CONNECTION *, const char *);
 DHCPCD_WPA *dhcpcd_wpa_new(DHCPCD_CONNECTION *, const char *);
 DHCPCD_CONNECTION *dhcpcd_wpa_connection(DHCPCD_WPA *);


@@ -220,6 +241,15 @@ bool dhcpcd_wpa_network_remove(DHCPCD_WPA *, int);
 char * dhcpcd_wpa_network_get(DHCPCD_WPA *, int, const char *);
 bool dhcpcd_wpa_network_set(DHCPCD_WPA *, int, const char *, const char *);
 
 char * dhcpcd_wpa_network_get(DHCPCD_WPA *, int, const char *);
 bool dhcpcd_wpa_network_set(DHCPCD_WPA *, int, const char *, const char *);
 

+#define DHCPCD_WPA_SUCCESS      0
+#define DHCPCD_WPA_ERR         -1
+#define DHCPCD_WPA_ERR_SET     -2
+#define DHCPCD_WPA_ERR_SET_PSK -3
+#define DHCPCD_WPA_ERR_ENABLE  -4
+#define DHCPCD_WPA_ERR_WRITE   -5
+#define DHCPCD_WPA_ERR_ASSOC   -6
+int dhcpcd_wpa_configure_psk(DHCPCD_WPA *w, DHCPCD_WI_SCAN *s, const char *p);
+

 char ** dhcpcd_config_blocks(DHCPCD_CONNECTION *, const char *);
 DHCPCD_OPTION *dhcpcd_config_read(DHCPCD_CONNECTION *,
     const char *, const char *);
 char ** dhcpcd_config_blocks(DHCPCD_CONNECTION *, const char *);
 DHCPCD_OPTION *dhcpcd_config_read(DHCPCD_CONNECTION *,
     const char *, const char *);


@@ -228,7 +258,12 @@ const char * dhcpcd_config_get(DHCPCD_OPTION *, const char *);
 const char * dhcpcd_config_get_static(DHCPCD_OPTION *, const char *);
 bool dhcpcd_config_set(DHCPCD_OPTION **, const char *, const char *);
 bool dhcpcd_config_set_static(DHCPCD_OPTION **, const char *, const char *);
 const char * dhcpcd_config_get_static(DHCPCD_OPTION *, const char *);
 bool dhcpcd_config_set(DHCPCD_OPTION **, const char *, const char *);
 bool dhcpcd_config_set_static(DHCPCD_OPTION **, const char *, const char *);

+bool dhcpcd_config_writeable(DHCPCD_CONNECTION *con);

 bool dhcpcd_config_write(DHCPCD_CONNECTION *,
     const char *, const char *, const DHCPCD_OPTION *);
 
 bool dhcpcd_config_write(DHCPCD_CONNECTION *,
     const char *, const char *, const DHCPCD_OPTION *);
 

+#ifdef __cplusplus
+}
+#endif
+

 #endif
 #endif