← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/collectd/oneiric

« back to all changes in this revision

Viewing changes to src/wireless.c

  • Committer: Bazaar Package Importer
  • Author(s): Morten Kjeldgaard
  • Date: 2008-11-18 15:54:20 UTC
  • mfrom: (1.1.5 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20081118155420-sc2mxv2pebafkmon
Tags: 4.4.2-2ubuntu1
https://launchpad.net/bugs/298828
* Merge from Debian unstable (LP: #298828). Remaining Ubuntu changes:
* Add ubuntu_in6-glibc28.dpatch patch, fix FTBFS.
* Add ubuntu_hardening.dpatch patch, fix FTBFS.
* Add ubuntu_perl.c.dpatch, fix FTBFS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/wireless.c
56
56
        vl.values = values;
57
57
        vl.values_len = 1;
58
58
        vl.time = time (NULL);
59
 
        strcpy (vl.host, hostname_g);
60
 
        strcpy (vl.plugin, "wireless");
 
59
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 
60
        sstrncpy (vl.plugin, "wireless", sizeof (vl.plugin));
61
61
        strncpy (vl.plugin_instance, plugin_instance,
62
62
                        sizeof (vl.plugin_instance));
63
63
 
128
128
                        power = 1.0; /* invalid */
129
129
                else if ((power >= 0.0) && (power <= 100.0))
130
130
                        power = wireless_percent_to_power (power);
131
 
                else if (power > 100.0)
 
131
                else if ((power > 100.0) && (power <= 256.0))
 
132
                        power = power - 256.0;
 
133
                else if (power > 0.0)
132
134
                        power = 1.0; /* invalid */
133
135
 
134
136
                /* noise [dBm] < 0.0 */
137
139
                        noise = 1.0; /* invalid */
138
140
                else if ((noise >= 0.0) && (noise <= 100.0))
139
141
                        noise = wireless_percent_to_power (noise);
140
 
                else if (noise > 100.0)
 
142
                else if ((noise > 100.0) && (noise <= 256.0))
 
143
                        noise = noise - 256.0;
 
144
                else if (noise > 0.0)
141
145
                        noise = 1.0; /* invalid */
142
146
 
143
147
                wireless_submit (device, "signal_quality", quality);