From d286e89ddda825a301a7dd84c1b5853c6bfe22c2 Mon Sep 17 00:00:00 2001 From: MissValeska Date: Tue, 20 May 2014 15:08:09 -0700 Subject: [PATCH] Here is a vagrant file I have been testing with, You will have to use vde_switch in order to run netsukuku without being disconnected from ssh. Also, I've done some work on the exclude argument, I'm testing some goto stuff right now, I'm primarily pushing this for testing purposes across multiple devices. --- .../default/virtualbox/action_provision | 1 + .../default/virtualbox/action_set_name | 1 + .../.vagrant/machines/default/virtualbox/id | 1 + Vagrant/Vagrantfile | 128 ++++++++++++++++++ Vagrant/Vagrantfile~ | 128 ++++++++++++++++++ src/netsukuku.c | 18 ++- 6 files changed, 271 insertions(+), 6 deletions(-) create mode 100644 Vagrant/.vagrant/machines/default/virtualbox/action_provision create mode 100644 Vagrant/.vagrant/machines/default/virtualbox/action_set_name create mode 100644 Vagrant/.vagrant/machines/default/virtualbox/id create mode 100644 Vagrant/Vagrantfile create mode 100644 Vagrant/Vagrantfile~ diff --git a/Vagrant/.vagrant/machines/default/virtualbox/action_provision b/Vagrant/.vagrant/machines/default/virtualbox/action_provision new file mode 100644 index 0000000..a572ff5 --- /dev/null +++ b/Vagrant/.vagrant/machines/default/virtualbox/action_provision @@ -0,0 +1 @@ +1400618788 \ No newline at end of file diff --git a/Vagrant/.vagrant/machines/default/virtualbox/action_set_name b/Vagrant/.vagrant/machines/default/virtualbox/action_set_name new file mode 100644 index 0000000..bdb8a59 --- /dev/null +++ b/Vagrant/.vagrant/machines/default/virtualbox/action_set_name @@ -0,0 +1 @@ +1400618762 \ No newline at end of file diff --git a/Vagrant/.vagrant/machines/default/virtualbox/id b/Vagrant/.vagrant/machines/default/virtualbox/id new file mode 100644 index 0000000..2d27894 --- /dev/null +++ b/Vagrant/.vagrant/machines/default/virtualbox/id @@ -0,0 +1 @@ +8a6e7c49-f699-430c-8761-497bf210692d \ No newline at end of file diff --git a/Vagrant/Vagrantfile b/Vagrant/Vagrantfile new file mode 100644 index 0000000..2980c95 --- /dev/null +++ b/Vagrant/Vagrantfile @@ -0,0 +1,128 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + # All Vagrant configuration is done here. The most common configuration + # options are documented and commented below. For a complete reference, + # please see the online documentation at vagrantup.com. + + # Every Vagrant virtual environment requires a box to build off of. + config.vm.box = "trusty64" + + # The url from where the 'config.vm.box' box will be fetched if it + # doesn't already exist on the user's system. + config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" + + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine. In the example below, + # accessing "localhost:8080" will access port 80 on the guest machine. + # config.vm.network :forwarded_port, guest: 80, host: 8080 + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network :private_network, ip: "192.168.33.10" + + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + # config.vm.network :public_network + + # If true, then any SSH connections made will enable agent forwarding. + # Default value: false + # config.ssh.forward_agent = true + + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + # config.vm.synced_folder "../data", "/vagrant_data" + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + # config.vm.provider :virtualbox do |vb| + # # Don't boot with headless mode + # vb.gui = true + # + # # Use VBoxManage to customize the VM. For example to change memory: + # vb.customize ["modifyvm", :id, "--memory", "1024"] + # end + # + # View the documentation for the provider you're using for more + # information on available options. + + # Enable provisioning with Puppet stand alone. Puppet manifests + # are contained in a directory path relative to this Vagrantfile. + # You will need to create the manifests directory and a manifest in + # the file base.pp in the manifests_path directory. + # + # An example Puppet manifest to provision the message of the day: + # + # # group { "puppet": + # # ensure => "present", + # # } + # # + # # File { owner => 0, group => 0, mode => 0644 } + # # + # # file { '/etc/motd': + # # content => "Welcome to your Vagrant-built virtual machine! + # # Managed by Puppet.\n" + # # } + # + # config.vm.provision :puppet do |puppet| + # puppet.manifests_path = "manifests" + # puppet.manifest_file = "init.pp" + # end + + # Enable provisioning with chef solo, specifying a cookbooks path, roles + # path, and data_bags path (all relative to this Vagrantfile), and adding + # some recipes and/or roles. + # + # config.vm.provision :chef_solo do |chef| + # chef.cookbooks_path = "../my-recipes/cookbooks" + # chef.roles_path = "../my-recipes/roles" + # chef.data_bags_path = "../my-recipes/data_bags" + # chef.add_recipe "mysql" + # chef.add_role "web" + # + # # You may also specify custom JSON attributes: + # chef.json = { :mysql_password => "foo" } + # end + + $script = %Q{ + sudo apt-get update + sudo apt-get install nasm make build-essential grub qemu zip -y + sudo apt-get install git vde2 zlibc libgmp-dev openssl libssl-dev libgee-dev libpth-dev libgcrypt11-dev autoconf cmake autogen mawk gawk + } + + + config.vm.provision :shell, :inline => $script + + + # Enable provisioning with chef server, specifying the chef server URL, + # and the path to the validation key (relative to this Vagrantfile). + # + # The Opscode Platform uses HTTPS. Substitute your organization for + # ORGNAME in the URL and validation key. + # + # If you have your own Chef Server, use the appropriate URL, which may be + # HTTP instead of HTTPS depending on your configuration. Also change the + # validation key to validation.pem. + # + # config.vm.provision :chef_client do |chef| + # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" + # chef.validation_key_path = "ORGNAME-validator.pem" + # end + # + # If you're using the Opscode platform, your validator client is + # ORGNAME-validator, replacing ORGNAME with your organization name. + # + # If you have your own Chef Server, the default validation client name is + # chef-validator, unless you changed the configuration. + # + # chef.validation_client_name = "ORGNAME-validator" +end diff --git a/Vagrant/Vagrantfile~ b/Vagrant/Vagrantfile~ new file mode 100644 index 0000000..edc5b66 --- /dev/null +++ b/Vagrant/Vagrantfile~ @@ -0,0 +1,128 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + # All Vagrant configuration is done here. The most common configuration + # options are documented and commented below. For a complete reference, + # please see the online documentation at vagrantup.com. + + # Every Vagrant virtual environment requires a box to build off of. + config.vm.box = "trusty64" + + # The url from where the 'config.vm.box' box will be fetched if it + # doesn't already exist on the user's system. + config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box" + + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine. In the example below, + # accessing "localhost:8080" will access port 80 on the guest machine. + # config.vm.network :forwarded_port, guest: 80, host: 8080 + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network :private_network, ip: "192.168.33.10" + + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + # config.vm.network :public_network + + # If true, then any SSH connections made will enable agent forwarding. + # Default value: false + # config.ssh.forward_agent = true + + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + # config.vm.synced_folder "../data", "/vagrant_data" + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + # config.vm.provider :virtualbox do |vb| + # # Don't boot with headless mode + # vb.gui = true + # + # # Use VBoxManage to customize the VM. For example to change memory: + # vb.customize ["modifyvm", :id, "--memory", "1024"] + # end + # + # View the documentation for the provider you're using for more + # information on available options. + + # Enable provisioning with Puppet stand alone. Puppet manifests + # are contained in a directory path relative to this Vagrantfile. + # You will need to create the manifests directory and a manifest in + # the file base.pp in the manifests_path directory. + # + # An example Puppet manifest to provision the message of the day: + # + # # group { "puppet": + # # ensure => "present", + # # } + # # + # # File { owner => 0, group => 0, mode => 0644 } + # # + # # file { '/etc/motd': + # # content => "Welcome to your Vagrant-built virtual machine! + # # Managed by Puppet.\n" + # # } + # + # config.vm.provision :puppet do |puppet| + # puppet.manifests_path = "manifests" + # puppet.manifest_file = "init.pp" + # end + + # Enable provisioning with chef solo, specifying a cookbooks path, roles + # path, and data_bags path (all relative to this Vagrantfile), and adding + # some recipes and/or roles. + # + # config.vm.provision :chef_solo do |chef| + # chef.cookbooks_path = "../my-recipes/cookbooks" + # chef.roles_path = "../my-recipes/roles" + # chef.data_bags_path = "../my-recipes/data_bags" + # chef.add_recipe "mysql" + # chef.add_role "web" + # + # # You may also specify custom JSON attributes: + # chef.json = { :mysql_password => "foo" } + # end + + $script = %Q{ + sudo apt-get update + sudo apt-get install nasm make build-essential grub qemu zip -y + sudo apt-get install git vde zlibc libgmp-dev openssl libssl-dev libgee-dev libpth-dev libgcrypt11-dev autoconf cmake autogen mawk gawk + } + + + config.vm.provision :shell, :inline => $script + + + # Enable provisioning with chef server, specifying the chef server URL, + # and the path to the validation key (relative to this Vagrantfile). + # + # The Opscode Platform uses HTTPS. Substitute your organization for + # ORGNAME in the URL and validation key. + # + # If you have your own Chef Server, use the appropriate URL, which may be + # HTTP instead of HTTPS depending on your configuration. Also change the + # validation key to validation.pem. + # + # config.vm.provision :chef_client do |chef| + # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" + # chef.validation_key_path = "ORGNAME-validator.pem" + # end + # + # If you're using the Opscode platform, your validator client is + # ORGNAME-validator, replacing ORGNAME with your organization name. + # + # If you have your own Chef Server, the default validation client name is + # chef-validator, unless you changed the configuration. + # + # chef.validation_client_name = "ORGNAME-validator" +end diff --git a/src/netsukuku.c b/src/netsukuku.c index 6448969..a6454be 100644 --- a/src/netsukuku.c +++ b/src/netsukuku.c @@ -337,15 +337,21 @@ void exclude_interface(void) { if(tmp->ifa_addr && tmp->ifa_addr->sa_family == AF_PACKET) ifs = tmp->ifa_name; - if(strncmp(ifs, "lo", 2) == 0 || strncmp(ifs, "tunl0", 5) == 0 || strncmp(ifs, "tunl1", 5) == 0 || strcmp(ifs, optarg) == 0) { - tmp = tmp->ifa_next; - if(tmp->ifa_addr && tmp->ifa_addr->sa_family == AF_PACKET) - ifs = tmp->ifa_name; - } + printf("One"); + + goto Check_Active; + + printf("Two"); + + if(strncmp(ifs, "lo", 2) == 0 || strncmp(ifs, "tunl0", 5) == 0 || strncmp(ifs, "tunl1", 5) == 0 || strcmp(ifs, optarg) == 0) + goto Check_Active; + + Check_Active: a_ifs = ifs; if(a_ifs->ifr_name != IFF_UP) { tmp = tmp->ifa_next; - ifs = tmp->ifa_name; + if(tmp->ifa_addr && tmp->ifa_addr->sa_family == AF_PACKET) + ifs = tmp->ifa_name; } tmp = tmp->ifa_next; if(strcmp(old_tmp, ifs) == 0)