20 files changed, 528 insertions, 14 deletions

diff --git a/TODO b/TODO
index 8953a65..400c91d 100644
--- a/TODO
+++ b/TODO
@@ -13,7 +13,7 @@ AssignPrivateIpAddresses           -                          [ ]        [ ]
 AssociateAddress                   assocaddr                  [X]        [X]
 AssociateDhcpOptions               -                          [ ]        [ ]
 AssociateRouteTable                -                          [ ]        [ ]
-AttachInternetGateway              -                          [ ]        [ ]
+AttachInternetGateway              atigw                      [X]        [ ]
 AttachNetworkInterface             -                          [ ]        [ ]
 AttachVolume                       atvol                      [X]        [X]
 AttachVpnGateway                   -                          [ ]        [ ]
@@ -32,7 +32,7 @@ CreateCustomerGateway              -                          [ ]        [ ]
 CreateDhcpOptions                  -                          [ ]        [ ]
 CreateImage                        mkimg                      [X]        [X]
 CreateInstanceExportTask           -                          [ ]        [ ]
-CreateInternetGateway              -                          [ ]        [ ]
+CreateInternetGateway              mkigw                      [X]        [ ]
 CreateKeyPair                      -                          [ ]        [ ]
 CreateNetworkAcl                   -                          [ ]        [ ]
 CreateNetworkAclEntry              -                          [ ]        [ ]
@@ -47,13 +47,13 @@ CreateSpotDatafeedSubscription     -                          [ ]        [ ]
 CreateSubnet                       -                          [ ]        [ ]
 CreateTags                         mktag                      [X]        [X]
 CreateVolume                       mkvol                      [X]        [X]
-CreateVpc                          -                          [ ]        [ ]
+CreateVpc                          mkvpc                      [X]        [X]
 CreateVpnConnection                -                          [ ]        [ ]
 CreateVpnConnectionRoute           -                          [ ]        [ ]
 CreateVpnGateway                   -                          [ ]        [ ]
 DeleteCustomerGateway              -                          [ ]        [ ]
 DeleteDhcpOptions                  -                          [ ]        [ ]
-DeleteInternetGateway              -                          [ ]        [ ]
+DeleteInternetGateway              rmigw                      [X]        [ ]
 DeleteKeyPair                      -                          [ ]        [ ]
 DeleteNetworkAcl                   -                          [ ]        [ ]
 DeleteNetworkAclEntry              -                          [ ]        [ ]
@@ -67,7 +67,7 @@ DeleteSpotDatafeedSubscription     -                          [ ]        [ ]
 DeleteSubnet                       -                          [ ]        [ ]
 DeleteTags                         rmtag                      [X]        [X]
 DeleteVolume                       rmvol                      [X]        [X]
-DeleteVpc                          -                          [ ]        [ ]
+DeleteVpc                          rmvpc                      [X]        [ ]
 DeleteVpnConnection                -                          [ ]        [ ]
 DeleteVpnConnectionRoute           -                          [ ]        [ ]
 DeleteVpnGateway                   -                          [ ]        [ ]
@@ -84,7 +84,7 @@ DescribeImages                     lsimg                      [X]        [X]
 DescribeInstanceAttribute          lsiattr                    [X]        [X]
 DescribeInstances                  lsinst                     [X]        [X]
 DescribeInstanceStatus             lsistat                    [X]        [X]
-DescribeInternetGateways           -                          [ ]        [ ]
+DescribeInternetGateways           lsigw                      [X]        [ ]
 DescribeKeyPairs                   -                          [ ]        [ ]
 DescribeNetworkAcls                -                          [ ]        [ ]
 DescribeNetworkInterfaceAttribute  -                          [ ]        [ ]
@@ -106,10 +106,11 @@ DescribeTags                       lstag                      [X]        [X]
 DescribeVolumes                    lsvol                      [X]        [X]
 DescribeVolumeAttribute            -                          [ ]        [ ]
 DescribeVolumeStatus               -                          [ ]        [ ]
-DescribeVpcs                       -                          [ ]        [ ]
+DescribeVpcAttribute               lsvpcattr                  [X]        [ ]
+DescribeVpcs                       lsvpc                      [X]        [ ]
 DescribeVpnConnections             -                          [ ]        [ ]
 DescribeVpnGateways                -                          [ ]        [ ]
-DetachInternetGateway              -                          [ ]        [ ]
+DetachInternetGateway              deigw                      [X]        [ ]
 DetachNetworkInterface             -                          [ ]        [ ]
 DetachVolume                       devol                      [X]        [X]
 DetachVpnGateway                   -                          [ ]        [ ]
@@ -128,6 +129,7 @@ ModifyInstanceAttribute            setiattr                   [X]        [X]
 ModifyNetworkInterfaceAttribute    -                          [ ]        [ ]
 ModifySnapshotAttribute            setsattr                   [X]        [X]
 ModifyVolumeAttribute              -                          [ ]        [ ]
+ModifyVpcAttribute                 setvpcattr                 [X]        [ ]
 MonitorInstances                   -                          [ ]        [ ]
 PurchaseReservedInstancesOffering  -                          [ ]        [ ]
 RebootInstances                    reboot                     [X]        [X]
diff --git a/doc/Makefile.inc b/doc/Makefile.inc
index 5885e21..9997bca 100644
--- a/doc/Makefile.inc
+++ b/doc/Makefile.inc
@@ -49,6 +49,7 @@ MANPAGES1=\
  eclat-mksnap.1\
  eclat-mktag.1\
  eclat-mkvol.1\
+ eclat-mkvpc.1\
  eclat-reboot.1\
  eclat-rmaddr.1\
  eclat-rmsg.1\
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 29ae900..10de3fd 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -27,6 +27,7 @@ FLNFILES=\
  create-snapshot.fln\
  create-tags.fln\
  create-volume.fln\
+ create-vpc.fln\
  delete-security-group.fln\
  delete-snapshot.fln\
  delete-tags.fln\
@@ -45,6 +46,7 @@ FLNFILES=\
  describe-snapshots.fln\
  describe-tags.fln\
  describe-volumes.fln\
+ describe-vpcs.fln\
  detach-volume.fln\
  disassociate-address.fln\
  get-console-output.fln\
diff --git a/etc/describe-vpc-attribute.fln b/etc/describe-vpc-attribute.fln
new file mode 100644
index 0000000..c96f624
--- /dev/null
+++ b/etc/describe-vpc-attribute.fln
@@ -0,0 +1,20 @@
+/* This file is part of Eclat.
+   Copyright (C) 2012-2015 Sergey Poznyakoff.
+ 
+   Eclat is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+ 
+   Eclat is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with Eclat.  If not, see <http://www.gnu.org/licenses/>. */
+
+if (.DescribeVpcAttributeResponse.enableDnsHostnames ||
+    .DescribeVpcAttributeResponse.enableDnsSupport) {
+  print(last.value,"\n");
+}  
\ No newline at end of file
diff --git a/etc/describe-vpcs.fln b/etc/describe-vpcs.fln
new file mode 100644
index 0000000..e53e2fc
--- /dev/null
+++ b/etc/describe-vpcs.fln
@@ -0,0 +1,22 @@
+/* This file is part of Eclat.
+   Copyright (C) 2012-2015 Sergey Poznyakoff.
+ 
+   Eclat is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+ 
+   Eclat is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with Eclat.  If not, see <http://www.gnu.org/licenses/>. */
+
+if (.DescribeVpcsResponse.vpcSet) {
+  for (var in .DescribeVpcsResponse.vpcSet.item) {
+    print(var.vpcId, "\t", var.cidrBlock, "\t", var.dhcpOptionsId, "\t",
+          var.state, "\t", var.isDefault, "\n");
+  }
+}
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ec7c66..d46ad42 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,6 +34,7 @@ eclat_SOURCES=\
  eclat.h\
  genericcl.c\
  getconout.c\
+ igw.c\
  io.c\
  lsaddr.c\
  lsattr.c\
@@ -48,6 +49,7 @@ eclat_SOURCES=\
  lssnap.c\
  lstag.c\
  lsvol.c\
+ lsvpc.c\
  lszon.c\
  mkimg.c\
  mkinst.c\
@@ -55,16 +57,19 @@ eclat_SOURCES=\