diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-05 15:52:39 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-03-19 14:39:09 +0100 |
| commit | 1bba43432a346a6dc542fade5f78bd63044fe06f (patch) | |
| tree | f56d6d4b83d2e0af3ffd85b66bb65d968d3b83ca | |
| parent | b686dd8488c3a568f41968596e22f0673c0b5c6e (diff) | |
| download | NetworkManager-1bba43432a346a6dc542fade5f78bd63044fe06f.tar.gz | |
core/trivial: move code
| -rw-r--r-- | src/nm-connectivity.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index d8d4bf7d88..c439410de1 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -33,6 +33,25 @@ /*****************************************************************************/ typedef struct { + GSimpleAsyncResult *simple; + char *response; + CURL *curl_ehandle; + size_t msg_size; + char *msg; + struct curl_slist *request_headers; + guint timeout_id; + char *ifspec; +} ConCheckCbData; + +enum { + PERIODIC_CHECK, + + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +typedef struct { char *uri; char *response; gboolean enabled; @@ -58,14 +77,6 @@ G_DEFINE_TYPE (NMConnectivity, nm_connectivity, G_TYPE_OBJECT) NM_DEFINE_SINGLETON_GETTER (NMConnectivity, nm_connectivity_get, NM_TYPE_CONNECTIVITY); -enum { - PERIODIC_CHECK, - - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - /*****************************************************************************/ #define _NMLOG_DOMAIN LOGD_CONCHECK @@ -99,17 +110,6 @@ NM_UTILS_LOOKUP_STR_DEFINE (nm_connectivity_state_to_string, NMConnectivityState /*****************************************************************************/ -typedef struct { - GSimpleAsyncResult *simple; - char *response; - CURL *curl_ehandle; - size_t msg_size; - char *msg; - struct curl_slist *request_headers; - guint timeout_id; - char *ifspec; -} ConCheckCbData; - static void finish_cb_data (ConCheckCbData *cb_data, NMConnectivityState new_state) { |