Commit 4fabd62c authored by Lorn Potter's avatar Lorn Potter

[connman] Quiet output down for stats output

parent 9e96a25c
......@@ -1435,7 +1435,7 @@ static void netreg_update_strength(struct modem_data *modem,
{
dbus_message_iter_get_basic(value, &modem->strength);
DBG("%s Strength %d", modem->path, modem->strength);
// DBG("%s Strength %d", modem->path, modem->strength);
if (!modem->network)
return;
......
......@@ -170,7 +170,7 @@ static void wifi_newlink(unsigned flags, unsigned change, void *user_data)
if (!wifi)
return;
DBG("index %d flags %d change %d", wifi->index, flags, change);
//DBG("index %d flags %d change %d", wifi->index, flags, change);
if ((wifi->flags & IFF_UP) != (flags & IFF_UP)) {
if (flags & IFF_UP)
......
......@@ -49,7 +49,7 @@ static void detect_newlink(unsigned short type, int index,
struct connman_device *device;
enum connman_device_type devtype;
DBG("type %d index %d", type, index);
// DBG("type %d index %d", type, index);
devtype = __connman_rtnl_get_device_type(index);
......
......@@ -1244,7 +1244,7 @@ struct connman_device *connman_device_create_from_index(int index)
return NULL;
if (__connman_device_isfiltered(devname)) {
DBG("Ignoring interface %s (filtered)", devname);
// DBG("Ignoring interface %s (filtered)", devname);
g_free(devname);
return NULL;
}
......@@ -1253,7 +1253,7 @@ struct connman_device *connman_device_create_from_index(int index)
switch (type) {
case CONNMAN_DEVICE_TYPE_UNKNOWN:
DBG("Ignoring interface %s (type unknown)", devname);
// DBG("Ignoring interface %s (type unknown)", devname);
g_free(devname);
return NULL;
case CONNMAN_DEVICE_TYPE_ETHERNET:
......@@ -1328,13 +1328,13 @@ bool __connman_device_isfiltered(const char *devname)
}
if (!match) {
DBG("ignoring device %s (match)", devname);
// DBG("ignoring device %s (match)", devname);
return true;
}
nodevice:
if (g_pattern_match_simple("dummy*", devname)) {
DBG("ignoring dummy networking devices");
// DBG("ignoring dummy networking devices");
return true;
}
......@@ -1343,7 +1343,7 @@ nodevice:
for (pattern = nodevice_filter; *pattern; pattern++) {
if (g_pattern_match_simple(*pattern, devname)) {
DBG("ignoring device %s (no match)", devname);
// DBG("ignoring device %s (no match)", devname);
return true;
}
}
......@@ -1356,7 +1356,7 @@ list:
for (pattern = blacklisted_interfaces; *pattern; pattern++) {
if (g_str_has_prefix(devname, *pattern)) {
DBG("ignoring device %s (blacklist)", devname);
// DBG("ignoring device %s (blacklist)", devname);
return true;
}
}
......@@ -1369,7 +1369,8 @@ static void cleanup_devices(void)
/*
* Check what interfaces are currently up and if connman is
* suppose to handle the interface, then cleanup the mess
* related to that interface. There might be weird routes etc
* related to that interface. There might be weird routes etc
* that are related to that interface and that might confuse
* connmand. So in this case we just turn the interface down
* so that kernel removes routes/addresses automatically and
......
......@@ -437,10 +437,10 @@ static void update_stats(struct connman_ipdevice *ipdevice,
if (stats->rx_packets == 0 && stats->tx_packets == 0)
return;
DBG("%s {RX} %llu packets %llu bytes", ifname,
stats->rx_packets, stats->rx_bytes);
DBG("%s {TX} %llu packets %llu bytes", ifname,
stats->tx_packets, stats->tx_bytes);
// DBG("%s {RX} %llu packets %llu bytes", ifname,
// stats->rx_packets, stats->rx_bytes);
// DBG("%s {TX} %llu packets %llu bytes", ifname,
// stats->tx_packets, stats->tx_bytes);
if (!ipdevice->config_ipv4 && !ipdevice->config_ipv6)
return;
......@@ -483,7 +483,7 @@ void __connman_ipconfig_newlink(int index, unsigned short type,
bool lower_up = false, lower_down = false;
char *ifname;
DBG("index %d", index);
// DBG("index %d", index);
if (type == ARPHRD_LOOPBACK)
return;
......@@ -1799,7 +1799,7 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig,
struct connman_ipaddress *append_addr = NULL;
const char *str;
DBG("");
// DBG("");
if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV4)
return;
......@@ -1856,7 +1856,7 @@ void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig,
struct connman_ipaddress *append_addr = NULL;
const char *str, *privacy;
DBG("");
// DBG("");
if (ipconfig->type != CONNMAN_IPCONFIG_TYPE_IPV6)
return;
......@@ -1914,7 +1914,7 @@ void __connman_ipconfig_append_ipv6config(struct connman_ipconfig *ipconfig,
{
const char *str, *privacy;
DBG("");
// DBG("");
str = __connman_ipconfig_method2string(ipconfig->method);
if (!str)
......@@ -1958,7 +1958,7 @@ void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig,
{
const char *str;
DBG("");
// DBG("");
str = __connman_ipconfig_method2string(ipconfig->method);
if (!str)
......
......@@ -1740,9 +1740,9 @@ int connman_network_set_bssid(struct connman_network *network,
if (!bssid)
return -EINVAL;
DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
bssid[0], bssid[1], bssid[2],
bssid[3], bssid[4], bssid[5]);
// DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
// bssid[0], bssid[1], bssid[2],
// bssid[3], bssid[4], bssid[5]);
for (;i < WIFI_BSSID_LEN_MAX;i++)
network->wifi.bssid[i] = bssid[i];
......@@ -1758,7 +1758,7 @@ unsigned char *connman_network_get_bssid(struct connman_network *network)
int connman_network_set_maxrate(struct connman_network *network,
unsigned int maxrate)
{
DBG("network %p maxrate %d", network, maxrate);
// DBG("network %p maxrate %d", network, maxrate);
network->wifi.maxrate = maxrate;
......@@ -1776,7 +1776,7 @@ int connman_network_set_enc_mode(struct connman_network *network,
if (!encryption_mode)
return -EINVAL;
DBG("network %p encryption mode %s", network, encryption_mode);
// DBG("network %p encryption mode %s", network, encryption_mode);
g_strlcpy(network->wifi.encryption_mode, encryption_mode,
WIFI_ENCYPTION_MODE_LEN_MAX);
......@@ -1797,7 +1797,7 @@ int connman_network_set_nameservers(struct connman_network *network,
char **nameservers_array;
int i;
DBG("network %p nameservers %s", network, nameservers);
// DBG("network %p nameservers %s", network, nameservers);
service = connman_service_lookup_from_network(network);
if (!service)
......@@ -1846,7 +1846,7 @@ int connman_network_set_domain(struct connman_network *network,
int connman_network_set_name(struct connman_network *network,
const char *name)
{
DBG("network %p name %s", network, name);
// DBG("network %p name %s", network, name);
g_free(network->name);
network->name = g_strdup(name);
......@@ -1865,7 +1865,7 @@ int connman_network_set_name(struct connman_network *network,
int connman_network_set_strength(struct connman_network *network,
uint8_t strength)
{
DBG("network %p strengh %d", network, strength);
// DBG("network %p strengh %d", network, strength);
network->strength = strength;
......@@ -1880,7 +1880,7 @@ uint8_t connman_network_get_strength(struct connman_network *network)
int connman_network_set_frequency(struct connman_network *network,
uint16_t frequency)
{
DBG("network %p frequency %d", network, frequency);
// DBG("network %p frequency %d", network, frequency);
network->frequency = frequency;
......@@ -1895,7 +1895,7 @@ uint16_t connman_network_get_frequency(struct connman_network *network)
int connman_network_set_wifi_channel(struct connman_network *network,
uint16_t channel)
{
DBG("network %p wifi channel %d", network, channel);
// DBG("network %p wifi channel %d", network, channel);
network->wifi.channel = channel;
......@@ -1918,7 +1918,7 @@ uint16_t connman_network_get_wifi_channel(struct connman_network *network)
int connman_network_set_string(struct connman_network *network,
const char *key, const char *value)
{
DBG("network %p key %s value %s", network, key, value);
// DBG("network %p key %s value %s", network, key, value);
if (g_strcmp0(key, "Name") == 0)
return connman_network_set_name(network, value);
......@@ -1982,7 +1982,7 @@ int connman_network_set_string(struct connman_network *network,
const char *connman_network_get_string(struct connman_network *network,
const char *key)
{
DBG("network %p key %s", network, key);
// DBG("network %p key %s", network, key);
if (g_str_equal(key, "Path"))
return network->path;
......@@ -2029,7 +2029,7 @@ const char *connman_network_get_string(struct connman_network *network,
int connman_network_set_bool(struct connman_network *network,
const char *key, bool value)
{
DBG("network %p key %s value %d", network, key, value);
// DBG("network %p key %s value %d", network, key, value);
if (g_strcmp0(key, "Roaming") == 0)
network->roaming = value;
......@@ -2051,7 +2051,7 @@ int connman_network_set_bool(struct connman_network *network,
bool connman_network_get_bool(struct connman_network *network,
const char *key)
{
DBG("network %p key %s", network, key);
// DBG("network %p key %s", network, key);
if (g_str_equal(key, "Roaming"))
return network->roaming;
......@@ -2075,7 +2075,7 @@ bool connman_network_get_bool(struct connman_network *network,
int connman_network_set_blob(struct connman_network *network,
const char *key, const void *data, unsigned int size)
{
DBG("network %p key %s size %d", network, key, size);
// DBG("network %p key %s size %d", network, key, size);
if (g_str_equal(key, "WiFi.SSID")) {
g_free(network->wifi.ssid);
......@@ -2103,7 +2103,7 @@ int connman_network_set_blob(struct connman_network *network,
const void *connman_network_get_blob(struct connman_network *network,
const char *key, unsigned int *size)
{
DBG("network %p key %s", network, key);
// DBG("network %p key %s", network, key);
if (g_str_equal(key, "WiFi.SSID")) {
if (size)
......
......@@ -138,7 +138,7 @@ static gboolean send_timeout(gpointer user_data)
{
uint32_t timeout = GPOINTER_TO_UINT(user_data);
DBG("send timeout %u (retries %d)", timeout, retries);
// DBG("send timeout %u (retries %d)", timeout, retries);
if (retries++ == NTP_SEND_RETRIES)
next_server();
......
......@@ -436,8 +436,8 @@ static void process_newlink(unsigned short type, int index, unsigned flags,
address.ether_addr_octet[5]);
if (flags & IFF_SLAVE) {
DBG("%s {newlink} ignoring slave, index %d address %s",
ifname, index, str);
// DBG("%s {newlink} ignoring slave, index %d address %s",
// ifname, index, str);
return;
}
......@@ -453,13 +453,13 @@ static void process_newlink(unsigned short type, int index, unsigned flags,
break;
}
DBG("%s {newlink} index %d address %s mtu %u",
ifname, index, str, mtu);
// DBG("%s {newlink} index %d address %s mtu %u",
// ifname, index, str, mtu);
if (operstate != 0xff)
DBG("%s {newlink} index %d operstate %u <%s>",
ifname, index, operstate,
operstate2str(operstate));
// if (operstate != 0xff)
// DBG("%s {newlink} index %d operstate %u <%s>",
// ifname, index, operstate,
// operstate2str(operstate));
interface = g_hash_table_lookup(interface_list, GINT_TO_POINTER(index));
if (!interface) {
......@@ -1326,10 +1326,10 @@ static int send_request(struct rtnl_request *req)
struct sockaddr_nl addr;
int sk;
DBG("%s len %d type %d flags 0x%04x seq %d",
type2string(req->hdr.nlmsg_type),
req->hdr.nlmsg_len, req->hdr.nlmsg_type,
req->hdr.nlmsg_flags, req->hdr.nlmsg_seq);
// DBG("%s len %d type %d flags 0x%04x seq %d",
// type2string(req->hdr.nlmsg_type),
// req->hdr.nlmsg_len, req->hdr.nlmsg_type,
// req->hdr.nlmsg_flags, req->hdr.nlmsg_seq);
sk = g_io_channel_unix_get_fd(channel);
......@@ -1354,7 +1354,7 @@ static int process_response(guint32 seq)
{
struct rtnl_request *req;
DBG("seq %d", seq);
// DBG("seq %d", seq);
req = find_request(seq);
if (req) {
......@@ -1371,7 +1371,7 @@ static int process_response(guint32 seq)
static void rtnl_message(void *buf, size_t len)
{
DBG("buf %p len %zd", buf, len);
// DBG("buf %p len %zd", buf, len);
while (len > 0) {
struct nlmsghdr *hdr = buf;
......@@ -1380,11 +1380,11 @@ static void rtnl_message(void *buf, size_t len)
if (!NLMSG_OK(hdr, len))
break;
DBG("%s len %d type %d flags 0x%04x seq %d pid %d",
type2string(hdr->nlmsg_type),
hdr->nlmsg_len, hdr->nlmsg_type,
hdr->nlmsg_flags, hdr->nlmsg_seq,
hdr->nlmsg_pid);
// DBG("%s len %d type %d flags 0x%04x seq %d pid %d",
// type2string(hdr->nlmsg_type),
// hdr->nlmsg_len, hdr->nlmsg_type,
// hdr->nlmsg_flags, hdr->nlmsg_seq,
// hdr->nlmsg_pid);
switch (hdr->nlmsg_type) {
case NLMSG_NOOP:
......@@ -1468,7 +1468,7 @@ static int send_getlink(void)
{
struct rtnl_request *req;
DBG("");
// DBG("");
req = g_try_malloc0(RTNL_REQUEST_SIZE);
if (!req)
......
......@@ -2154,7 +2154,7 @@ static void stats_append(struct connman_service *service,
DBusMessageIter array, dict;
DBusMessage *msg;
DBG("service %p counter %s", service, counter);
//DBG("service %p counter %s", service, counter);
msg = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_CALL);
if (!msg)
......@@ -2206,7 +2206,7 @@ static void stats_update(struct connman_service *service,
struct connman_stats_data *data = &stats->data;
unsigned int seconds;
DBG("service %p", service);
// DBG("service %p", service);
if (stats->valid) {
data->rx_packets += DELTA(rx_packets, data_last->rx_packets);
......@@ -3291,7 +3291,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
DBusMessage *reply;
DBusMessageIter array, dict;
DBG("service %p", service);
//DBG("service %p", service);
reply = dbus_message_new_method_return(msg);
if (!reply)
......@@ -4760,7 +4760,7 @@ static void service_append_added_foreach(gpointer data, gpointer user_data)
append_struct(service, iter);
g_hash_table_remove(services_notify->add, service->path);
} else {
DBG("changed %s", service->path);
//DBG("changed %s", service->path);
append_struct_service(iter, NULL, service);
}
......@@ -4794,7 +4794,7 @@ static gboolean service_send_changed(gpointer data)
{
DBusMessage *signal;
DBG("");
//DBG("");
services_notify->id = 0;
......
upstream @ 075e1bbd
Subproject commit e22ad5f161a487afc41d12ab630a536cbfa3e2a7
Subproject commit 075e1bbdda5b2ba2bba6fc75e458684365e5c6e9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment