← Back to branch summary

~smoser/ubuntu/oneiric/openvpn/lp-794916

« back to all changes in this revision

Viewing changes to manage.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-05-05 03:06:19 UTC
  • mfrom: (10.2.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100505030619-cwre0snhgx1mql53
Tags: 2.1.0-2ubuntu1
* Merge from debian unstable.  Remaining changes:
  + debian/openvpn.init.d:
    - Do not use start-stop-daemon and use </dev/null to avoid blocking boot
    - Show per-VPN result messages
    - Add "--script-security 2" by default for backwards compatablitiy
   + debian/control: Add lsb-base >= 3.2-14 to allow status_of_proc() 

Show diffs side-by-side

added added

removed removed

Lines of Context:
manage.c
1877
1877
          /*
1878
1878
           * Initialize socket address
1879
1879
           */
1880
 
          ms->local.sa.sin_family = AF_INET;
1881
 
          ms->local.sa.sin_addr.s_addr = 0;
1882
 
          ms->local.sa.sin_port = htons (port);
 
1880
          ms->local.addr.in4.sin_family = AF_INET;
 
1881
          ms->local.addr.in4.sin_addr.s_addr = 0;
 
1882
          ms->local.addr.in4.sin_port = htons (port);
1883
1883
 
1884
1884
          /*
1885
1885
           * Run management over tunnel, or
1891
1891
            }
1892
1892
          else
1893
1893
            {
1894
 
              ms->local.sa.sin_addr.s_addr = getaddr
 
1894
              ms->local.addr.in4.sin_addr.s_addr = getaddr
1895
1895
                (GETADDR_RESOLVE|GETADDR_WARN_ON_SIGNAL|GETADDR_FATAL, addr, 0, NULL, NULL);
1896
1896
            }
1897
1897
        }
2258
2258
      && man->connection.state == MS_INITIAL)
2259
2259
    {
2260
2260
      /* listen on our local TUN/TAP IP address */
2261
 
      man->settings.local.sa.sin_addr.s_addr = htonl (tun_local_ip);
 
2261
      man->settings.local.addr.in4.sin_addr.s_addr = htonl (tun_local_ip);
2262
2262
      man_connection_init (man);
2263
2263
    }
2264
2264