← Back to branch summary

~ubuntu-branches/ubuntu/wily/net-snmp/wily-proposed

« back to all changes in this revision

Viewing changes to apps/snmpnetstat/inet.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-28 14:59:36 UTC
  • mfrom: (1.2.3 upstream) (1.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100628145936-cbiallic69pn044g
Tags: 5.4.3~dfsg-1ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/589056
https://launchpad.net/bugs/573391
https://launchpad.net/bugs/533603
* Merge from debian unstable.  Remaining changes:
  - Set Ubuntu maintainer address.
  - net-snmp-config: Use bash. (LP: #104738)
  - Removed multiuser option when calling update-rc.d. (LP: #254261)
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
    (LP: #250459)
  - debian/snmpd.postinst: source debconf before doing work, LP: #589056
  - debian/snmp.preinst, debian/snmp.prerm: kill any/all processes owned by
    snmp user before install/uninstall, LP: #573391
  - Add apport hook (LP: #533603):
  - debian/{snmp,snmpd}.apport: Added.
  - debian/control: Build-depends on dh-apport.
  - debian/rules: 
    + Add --with apport.
    + override_dh_apport to install hook on snmpd package only.
 * Dropped patches:
   - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/snmpnetstat/inet.c
158
158
        cp[2] = vp->name[ 12 ] & 0xff;
159
159
        cp[3] = vp->name[ 13 ] & 0xff;
160
160
        localAddr.s_addr = tmpAddr.addr.s_addr;
161
 
        localPort        = ntohs(vp->name[ 14 ]);
 
161
        localPort        = ntohs((u_short)(vp->name[ 14 ]));
162
162
        cp = tmpAddr.data;
163
163
        cp[0] = vp->name[ 15 ] & 0xff;
164
164
        cp[1] = vp->name[ 16 ] & 0xff;
165
165
        cp[2] = vp->name[ 17 ] & 0xff;
166
166
        cp[3] = vp->name[ 18 ] & 0xff;
167
167
        remoteAddr.s_addr = tmpAddr.addr.s_addr;
168
 
        remotePort        = ntohs(vp->name[ 19 ]);
 
168
        remotePort        = ntohs((u_short)(vp->name[ 19 ]));
169
169
 
170
170
        printf("%-5.5s", name);
171
171
        inetprint(&localAddr,  localPort,  name, 1);
223
223
        cp[2] = vp->name[ 12 ] & 0xff;
224
224
        cp[3] = vp->name[ 13 ] & 0xff;
225
225
        localAddr.s_addr = tmpAddr.addr.s_addr;
226
 
        localPort        = ntohs( vp->name[ 14 ]);
 
226
        localPort        = ntohs( (u_short)(vp->name[ 14 ]));
227
227
        inetprint(&localAddr, localPort, name, 1);
228
228
        putchar('\n');
229
229
    }