← Back to branch summary

~ubuntu-branches/ubuntu/natty/iptables/natty

« back to all changes in this revision

Viewing changes to extensions/libxt_time.c

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2009-07-14 15:59:54 UTC
  • mfrom: (5.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090714155954-9039kro8cnh6lb1q
Tags: 1.4.4-1ubuntu1
https://launchpad.net/bugs/399211
* Merge from debian unstable, remaining changes: LP: #399211
  - Don't fail to run iptables-save if iptables module isn't loaded.
  - debian/patches/0901-build-libipq_pic.a.patch - Build libipq_pic.a with
    -fPIC. Upstream changed build system and patch modified accordingly.
  - Revert changes between 1.4.1.1-3 and 1.4.1.1-4, thus bringing back
    the howtos.
  - Added linuxdoc-tools to Build-Depends
  - Modified debian/iptables{,-dev}.install to match DM syntax
    (removed debian/tmp)

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/libxt_time.c
406
406
static void time_print(const void *ip, const struct xt_entry_match *match,
407
407
                       int numeric)
408
408
{
409
 
        struct xt_time_info *info = (void *)match->data;
 
409
        const struct xt_time_info *info = (const void *)match->data;
410
410
        unsigned int h, m, s;
411
411
 
412
412
        printf("TIME ");
467
467
 
468
468
static struct xtables_match time_match = {
469
469
        .name          = "time",
470
 
        .family        = AF_UNSPEC,
 
470
        .family        = NFPROTO_UNSPEC,
471
471
        .version       = XTABLES_VERSION,
472
472
        .size          = XT_ALIGN(sizeof(struct xt_time_info)),
473
473
        .userspacesize = XT_ALIGN(sizeof(struct xt_time_info)),