120406-dce-quagga-support.patch
author Hajime Tazaki <tazaki@nict.go.jp>
Wed, 11 Apr 2012 11:21:19 +0900
changeset 18 1811be862c59
parent 14 6f4976897048
child 20 5ca51e147e7f
permissions -rw-r--r--
update test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
     1
* * *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
     2
quagga ospfd with ns-3-linux support
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
     3
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
     4
diff -r 28c0c7f781c1 example/dce-zebra-simple.cc
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
     5
--- a/example/dce-zebra-simple.cc	Thu Mar 29 17:00:46 2012 +0200
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
     6
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
     7
@@ -1,114 +0,0 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
     8
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
     9
-/*
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    10
- * Copyright (c) 2011 UCLA
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    11
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    12
- * This program is free software; you can redistribute it and/or modify
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    13
- * it under the terms of the GNU General Public License version 2 as
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    14
- * published by the Free Software Foundation;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    15
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    16
- * This program is distributed in the hope that it will be useful,
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    17
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    18
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    19
- * GNU General Public License for more details.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    20
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    21
- * You should have received a copy of the GNU General Public License
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    22
- * along with this program; if not, write to the Free Software
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    23
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    24
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    25
- * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    26
- */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    27
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    28
-#include "ns3/network-module.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    29
-#include "ns3/core-module.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    30
-#include "ns3/internet-module.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    31
-#include "ns3/ipv4-global-routing-helper.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    32
-#include "ns3/dce-module.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    33
-#include "ns3/quagga-helper.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    34
-#include "ns3/point-to-point-grid.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    35
-#include "../helper/ipv4-dce-routing-helper.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    36
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    37
-using namespace ns3;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    38
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    39
-NS_LOG_COMPONENT_DEFINE ("quagga");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    40
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    41
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    42
-procExit (std::string path, uint16_t pid, int retcode)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    43
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    44
-  std::cout << "Process exit path=" << path << " pid=" << pid << " retcode=" << retcode << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    45
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    46
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    47
-// Parameters
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    48
-uint32_t nNodes = 2;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    49
-uint32_t stopTime = 60;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    50
-std::string netStack = "ns3";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    51
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    52
-void TestDisable (Ptr<Node> node)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    53
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    54
-  NS_LOG_FUNCTION (node->GetId ());
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    55
-  
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    56
-  Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    57
-  NS_ASSERT_MSG (ipv4 != 0, "ipv4 should not be null");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    58
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    59
-  // The thing I didn't know is that interface status (isUp/isDown) and device status (isLinkUp) are two totally different things.  It is possible to set interface up and down, but there is not an easy way to alter status of device. This similar to reality: it is possible to programmatically disable interface, but to actually disable a link one needs to physically cut the cable
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    60
-  ipv4->SetDown (2);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    61
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    62
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    63
-int main (int argc, char *argv[])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    64
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    65
-  CommandLine cmd;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    66
-  cmd.AddValue ("nNodes", "Number of Router nodes", nNodes);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    67
-  cmd.AddValue ("stopTime", "Time to stop(seconds)", stopTime);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    68
-  cmd.AddValue ("netStack", "What network stack", netStack);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    69
-  cmd.Parse (argc, argv);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    70
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    71
-  PointToPointHelper p2p;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    72
-  InternetStackHelper stack;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    73
-  Ipv4DceRoutingHelper ipv4RoutingHelper;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    74
-  
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    75
-  stack.SetRoutingHelper (ipv4RoutingHelper);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    76
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    77
-  PointToPointGridHelper grid (nNodes, nNodes, p2p);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    78
-  grid.InstallStack (stack);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    79
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    80
-  grid.AssignIpv4Addresses (
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    81
-                            Ipv4AddressHelper("10.1.0.0", "255.255.255.0"),
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    82
-                            Ipv4AddressHelper("10.2.0.0", "255.255.255.0")
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    83
-                            );
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    84
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    85
-  Ptr<DceManagerHelper> dceManager = CreateObject<DceManagerHelper> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    86
-  dceManager->SetNetworkStack("ns3::Ns3SocketFdFactory");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    87
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    88
-  QuaggaHelper quagga;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    89
-  
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    90
-  ApplicationContainer apps;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    91
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    92
-  for (int i=0; i<nNodes; i++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    93
-    for (int j=0; j<nNodes; j++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    94
-      {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    95
-        Ptr<Node> node = grid.GetNode (i,j);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    96
-        dceManager->Install (node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    97
-        quagga.EnableOspf (node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    98
-        quagga.EnableOspfDebug (node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
    99
-        quagga.EnableZebraDebug (node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   100
-        apps.Add (quagga.Install (node));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   101
-      }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   102
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   103
-  apps.Stop (Seconds(150.0));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   104
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   105
-  Simulator::ScheduleWithContext (grid.GetNode (0,0)->GetId (),
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   106
-                                  Seconds (80.0), TestDisable, grid.GetNode (0,0));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   107
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   108
-  Config::Connect ("/NodeList/*/$ns3::DceManager/Exit", MakeCallback (&procExit));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   109
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   110
-  // Trace routing tables 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   111
-  Ptr<OutputStreamWrapper> routingStream = Create<OutputStreamWrapper> ("routes.log", std::ios::out);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   112
-  ipv4RoutingHelper.PrintRoutingTableAllEvery (Seconds (10), routingStream);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   113
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   114
-  Simulator::Stop (Seconds(160.0));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   115
-  Simulator::Run ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   116
-  Simulator::Destroy ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   117
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   118
-  NS_LOG_INFO ("End of experiment");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   119
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   120
-  return 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   121
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   122
diff -r 28c0c7f781c1 helper/quagga-helper.cc
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   123
--- a/helper/quagga-helper.cc	Thu Mar 29 17:00:46 2012 +0200
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   124
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   125
@@ -1,596 +0,0 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   126
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   127
-/*
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   128
- * Copyright (c) 2010 Hajime Tazaki
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   129
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   130
- * This program is free software; you can redistribute it and/or modify
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   131
- * it under the terms of the GNU General Public License version 2 as
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   132
- * published by the Free Software Foundation;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   133
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   134
- * This program is distributed in the hope that it will be useful,
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   135
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   136
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   137
- * GNU General Public License for more details.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   138
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   139
- * You should have received a copy of the GNU General Public License
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   140
- * along with this program; if not, write to the Free Software
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   141
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   142
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   143
- * Author: Hajime Tazaki <tazaki@sfc.wide.ad.jp>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   144
- */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   145
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   146
-#include "ns3/object-factory.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   147
-#include "quagga-helper.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   148
-#include "ns3/names.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   149
-#include "ns3/ipv4-l3-protocol.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   150
-//#include "ns3/utils.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   151
-#include <fstream>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   152
-#include <map>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   153
-#include <sys/stat.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   154
-#include "ns3/log.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   155
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   156
-NS_LOG_COMPONENT_DEFINE ("QuaggaHelper");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   157
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   158
-namespace ns3 {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   159
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   160
-class QuaggaConfig: public Object
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   161
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   162
-private:
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   163
-  static int index;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   164
-  std::string router_id;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   165
-  std::map<std::string, uint32_t> *networks;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   166
-public:
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   167
-  QuaggaConfig ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   168
-    : m_tdpenable (false),
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   169
-      m_zebradebug (false),
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   170
-      m_usemanualconf (false)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   171
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   172
-    m_radvd_if = new std::vector<std::string> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   173
-    m_egress_if = new std::vector<std::string> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   174
-    m_haflag_if = new std::vector<std::string> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   175
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   176
-  virtual ~QuaggaConfig ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   177
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   178
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   179
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   180
-  static TypeId 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   181
-  GetTypeId (void)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   182
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   183
-    static TypeId tid = TypeId ("ns3::QuaggaConfig")
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   184
-      .SetParent<Object> ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   185
-      .AddConstructor<QuaggaConfig> ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   186
-      ;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   187
-    return tid;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   188
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   189
-  TypeId 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   190
-  GetInstanceTypeId (void) const
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   191
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   192
-    return GetTypeId ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   193
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   194
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   195
-  void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   196
-  SetFilename (const std::string &filename)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   197
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   198
-    m_filename = filename;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   199
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   200
-  
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   201
-  std::string
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   202
-  GetFilename () const 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   203
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   204
-    return m_filename;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   205
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   206
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   207
-  bool m_tdpenable;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   208
-  bool m_zebradebug;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   209
-  bool m_usemanualconf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   210
-  std::vector<std::string> *m_radvd_if;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   211
-  std::vector<std::string> *m_egress_if;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   212
-  std::vector<std::string> *m_haflag_if;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   213
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   214
-  std::string m_filename;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   215
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   216
-  std::vector<uint32_t> iflist;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   217
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   218
-  virtual void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   219
-  Print (std::ostream& os) const
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   220
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   221
-    os << "hostname zebra" << std::endl
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   222
-       << "password zebra" << std::endl
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   223
-       << "log stdout" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   224
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   225
-};
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   226
-std::ostream& operator << (std::ostream& os, QuaggaConfig const& config)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   227
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   228
-  config.Print (os);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   229
-  return os;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   230
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   231
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   232
-class OspfConfig : public Object
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   233
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   234
-private:
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   235
-  std::map<std::string, uint32_t> *networks;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   236
-public:
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   237
-  OspfConfig ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   238
-    : m_ospfdebug (false)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   239
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   240
-    networks = new std::map<std::string, uint32_t> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   241
-    iflist = new std::vector<uint32_t> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   242
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   243
-  ~OspfConfig ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   244
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   245
-    delete networks;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   246
-    delete iflist;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   247
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   248
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   249
-  bool m_ospfdebug;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   250
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   251
-  static TypeId 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   252
-  GetTypeId (void)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   253
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   254
-    static TypeId tid = TypeId ("ns3::OspfConfig")
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   255
-      .SetParent<Object> ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   256
-      .AddConstructor<OspfConfig> ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   257
-      ;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   258
-    return tid;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   259
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   260
-  TypeId 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   261
-  GetInstanceTypeId (void) const
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   262
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   263
-    return GetTypeId ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   264
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   265
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   266
-  void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   267
-  addNetwork (Ipv4Address prefix, uint32_t plen, uint32_t area)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   268
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   269
-    std::stringstream net;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   270
-    net << prefix << "/" << plen;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   271
-    networks->insert (std::map<std::string, uint32_t>::value_type (net.str (), area));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   272
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   273
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   274
-  void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   275
-  SetFilename (const std::string &filename)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   276
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   277
-    m_filename = filename;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   278
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   279
-  
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   280
-  std::string
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   281
-  GetFilename () const 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   282
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   283
-    return m_filename;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   284
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   285
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   286
-  virtual void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   287
-  Print (std::ostream& os) const
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   288
-  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   289
-    os << "hostname zebra" << std::endl
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   290
-       << "password zebra" << std::endl
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   291
-       << "log stdout" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   292
-    if (m_ospfdebug)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   293
-      {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   294
-        //os << "log trap errors" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   295
-        os << "debug ospf event " << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   296
-        os << "debug ospf nsm " << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   297
-        os << "debug ospf ism " << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   298
-        os << "debug ospf packet all " << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   299
-      }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   300
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   301
-    for (std::vector<uint32_t>::iterator i = iflist->begin (); 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   302
-         i != iflist->end (); ++i)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   303
-      {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   304
-        os << "interface ns3-device" << (*i) << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   305
-      }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   306
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   307
-    os << "router ospf " << std::endl; 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   308
-    //    os << "  ospf router-id " << m_routerId << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   309
-    for (std::map<std::string, uint32_t>::iterator i = networks->begin (); 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   310
-         i != networks->end (); ++i)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   311
-      {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   312
-        os << "  network " << (*i).first << " area " << (*i).second << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   313
-      }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   314
-    os << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   315
-  }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   316
-  std::vector<uint32_t> *iflist;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   317
-  std::string m_filename;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   318
-  uint32_t m_routerId;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   319
-};
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   320
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   321
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   322
-QuaggaHelper::QuaggaHelper ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   323
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   324
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   325
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   326
-void 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   327
-QuaggaHelper::SetAttribute (std::string name, const AttributeValue &value)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   328
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   329
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   330
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   331
-// OSPF
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   332
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   333
-QuaggaHelper::EnableOspf (NodeContainer nodes)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   334
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   335
-  //  for (uint32_t i = 0; i < nodes.GetN (); i++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   336
-  for (uint32_t i = 0; i < nodes.GetN (); i ++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   337
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   338
-      Ptr<OspfConfig> ospf_conf = CreateObject<OspfConfig> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   339
-      nodes.Get (i)->AggregateObject (ospf_conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   340
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   341
-      for (uint32_t j = 0; j < nodes.Get (i)->GetNDevices (); j ++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   342
-        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   343
-          // Use primary address, if multiple
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   344
-          //      Ipv4Address addr = interfaces->GetAddress (i, 0).GetLocal ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   345
-          // uint32_t ifindex = interfaces.Get (i).second;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   346
-          // g_ospf_conf->iflist->insert (std::map<Ptr<Node>, uint32_t>::value_type (nodes.Get (i), ifindex));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   347
-        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   348
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   349
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   350
-  return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   351
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   352
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   353
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   354
-QuaggaHelper::EnableOspfDebug (NodeContainer nodes)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   355
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   356
-  for (uint32_t i = 0; i < nodes.GetN (); i ++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   357
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   358
-      Ptr<OspfConfig> ospf_conf = nodes.Get (i)->GetObject<OspfConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   359
-      if (!ospf_conf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   360
-        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   361
-          ospf_conf = new OspfConfig ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   362
-          nodes.Get (i)->AggregateObject (ospf_conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   363
-        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   364
-      ospf_conf->m_ospfdebug = true;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   365
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   366
-  return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   367
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   368
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   369
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   370
-QuaggaHelper::EnableTdpNina (NodeContainer nodes)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   371
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   372
-  for (uint32_t i = 0; i < nodes.GetN (); i ++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   373
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   374
-      Ptr<QuaggaConfig> zebra_conf = nodes.Get (i)->GetObject<QuaggaConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   375
-      if (!zebra_conf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   376
-        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   377
-          zebra_conf = new QuaggaConfig ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   378
-          nodes.Get (i)->AggregateObject (zebra_conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   379
-        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   380
-      zebra_conf->m_tdpenable = true;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   381
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   382
-  return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   383
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   384
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   385
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   386
-QuaggaHelper::EnableZebraDebug (NodeContainer nodes)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   387
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   388
-  for (uint32_t i = 0; i < nodes.GetN (); i ++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   389
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   390
-      Ptr<QuaggaConfig> zebra_conf = nodes.Get (i)->GetObject<QuaggaConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   391
-      if (!zebra_conf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   392
-        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   393
-          zebra_conf = new QuaggaConfig ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   394
-          nodes.Get (i)->AggregateObject (zebra_conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   395
-        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   396
-      zebra_conf->m_zebradebug = true;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   397
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   398
-  return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   399
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   400
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   401
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   402
-QuaggaHelper::EnableRadvd (Ptr<Node> node, const char *ifname)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   403
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   404
-  Ptr<QuaggaConfig> zebra_conf = node->GetObject<QuaggaConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   405
-  if (!zebra_conf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   406
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   407
-      zebra_conf = new QuaggaConfig ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   408
-      node->AggregateObject (zebra_conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   409
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   410
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   411
-  zebra_conf->m_radvd_if->push_back (std::string(ifname));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   412
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   413
-  return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   414
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   415
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   416
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   417
-QuaggaHelper::EnableEgressIF (Ptr<Node> node, const char *ifname)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   418
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   419
-  Ptr<QuaggaConfig> zebra_conf = node->GetObject<QuaggaConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   420
-  if (!zebra_conf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   421
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   422
-      zebra_conf = new QuaggaConfig ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   423
-      node->AggregateObject (zebra_conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   424
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   425
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   426
-  zebra_conf->m_egress_if->push_back (std::string(ifname));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   427
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   428
-  return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   429
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   430
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   431
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   432
-QuaggaHelper::EnableHomeAgentFlag (Ptr<Node> node, const char *ifname)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   433
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   434
-  Ptr<QuaggaConfig> zebra_conf = node->GetObject<QuaggaConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   435
-  if (!zebra_conf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   436
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   437
-      zebra_conf = new QuaggaConfig ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   438
-      node->AggregateObject (zebra_conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   439
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   440
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   441
-  zebra_conf->m_haflag_if->push_back (std::string(ifname));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   442
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   443
-  return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   444
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   445
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   446
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   447
-QuaggaHelper::UseManualConfig (NodeContainer nodes)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   448
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   449
-  for (uint32_t i = 0; i < nodes.GetN (); i ++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   450
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   451
-      Ptr<QuaggaConfig> zebra_conf = nodes.Get (i)->GetObject<QuaggaConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   452
-      if (!zebra_conf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   453
-        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   454
-          zebra_conf = new QuaggaConfig ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   455
-          nodes.Get (i)->AggregateObject (zebra_conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   456
-        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   457
-      zebra_conf->m_usemanualconf = true;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   458
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   459
-  return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   460
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   461
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   462
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   463
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   464
-QuaggaHelper::GenerateConfigZebra (Ptr<Node> node)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   465
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   466
-  Ptr<QuaggaConfig> zebra_conf = node->GetObject<QuaggaConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   467
-  Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   468
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   469
-  if (zebra_conf->m_usemanualconf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   470
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   471
-      return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   472
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   473
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   474
-  NS_LOG_DEBUG ("ipv4->GetNInterfaces () = " << ipv4->GetNInterfaces ());
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   475
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   476
-//   for (uint32_t i = 0; i < ipv4->GetNInterfaces (); i ++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   477
-//     {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   478
-//       Ipv4Address addr = ipv4->GetAddress (i, 0).GetLocal ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   479
-//       Ipv4Mask mask = ipv4->GetAddress (i, 0).GetMask ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   480
-//       Ipv4Address prefix = addr.CombineMask (mask);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   481
-// 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   482
-//       NS_LOG_DEBUG ("address: " << addr);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   483
-// 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   484
-//       if (addr.IsEqual (Ipv4Address::GetLoopback()))
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   485
-//         {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   486
-//           continue;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   487
-//         }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   488
-//       
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   489
-//       zebra_conf->iflist.push_back (i);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   490
-//     }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   491
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   492
-  // config generation
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   493
-  std::stringstream conf_dir, conf_file;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   494
-  // FIXME XXX
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   495
-  conf_dir << "files-" << node->GetId () << "";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   496
-  ::mkdir (conf_dir.str ().c_str (), S_IRWXU | S_IRWXG);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   497
-  conf_dir << "/usr/";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   498
-  ::mkdir (conf_dir.str ().c_str (), S_IRWXU | S_IRWXG);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   499
-  conf_dir << "/local/";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   500
-  ::mkdir (conf_dir.str ().c_str (), S_IRWXU | S_IRWXG);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   501
-  conf_dir << "/etc/";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   502
-  ::mkdir (conf_dir.str ().c_str (), S_IRWXU | S_IRWXG);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   503
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   504
-  conf_file << conf_dir.str() << "/zebra.conf";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   505
-  zebra_conf->SetFilename ("/usr/local/etc/zebra.conf");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   506
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   507
-  std::ofstream conf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   508
-  conf.open (conf_file.str ().c_str ());
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   509
-  conf << *zebra_conf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   510
-  if (zebra_conf->m_zebradebug)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   511
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   512
-      conf << "debug zebra kernel" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   513
-      conf << "debug zebra events" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   514
-      // conf << "debug zebra route" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   515
-      conf << "debug zebra packet" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   516
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   517
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   518
-  // radvd
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   519
-  for (std::vector<std::string>::iterator i = zebra_conf->m_radvd_if->begin (); 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   520
-       i != zebra_conf->m_radvd_if->end (); ++i)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   521
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   522
-      conf << "interface " << (*i) << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   523
-      conf << " ipv6 nd ra-interval 5" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   524
-      conf << " ipv6 nd prefix-advertisement" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   525
-      conf << " no ipv6 nd suppress-ra" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   526
-      conf << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   527
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   528
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   529
-  // ha flag
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   530
-  for (std::vector<std::string>::iterator i = zebra_conf->m_haflag_if->begin (); 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   531
-       i != zebra_conf->m_haflag_if->end (); ++i)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   532
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   533
-      conf << "interface " << (*i) << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   534
-      conf << " ipv6 nd home-agent-config-flag" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   535
-      conf << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   536
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   537
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   538
-  // egress IF
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   539
-  for (std::vector<std::string>::iterator i = zebra_conf->m_egress_if->begin (); 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   540
-       i != zebra_conf->m_egress_if->end (); ++i)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   541
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   542
-      conf << "interface " << (*i) << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   543
-      conf << " ipv6 nd td egress" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   544
-      conf << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   545
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   546
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   547
-  for (std::vector<uint32_t>::iterator i = zebra_conf->iflist.begin ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   548
-       i != zebra_conf->iflist.end ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   549
-       i++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   550
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   551
-      conf << "interface eth" << *i << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   552
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   553
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   554
-#if 0
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   555
-  if (zebra_conf->m_tdpenable)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   556
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   557
-      conf << "interface sim0" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   558
-      conf << " ipv6 nd ra-interval 5" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   559
-      conf << " ipv6 nd prefix-advertisement" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   560
-      conf << " no ipv6 nd suppress-ra" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   561
-      conf << " ipv6 nd home-agent-config-flag" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   562
-      conf << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   563
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   564
-      conf << "interface sim1" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   565
-      //      conf << " ipv6 nd td ingress" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   566
-      conf << " ipv6 nd ra-interval 5" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   567
-      conf << " ipv6 nd prefix-advertisement" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   568
-      conf << " no ipv6 nd suppress-ra" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   569
-      conf << " ipv6 nd home-agent-config-flag" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   570
-      conf << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   571
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   572
-      conf << "interface sim2" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   573
-      //      conf << " ipv6 nd td ingress" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   574
-      conf << " ipv6 nd ra-interval 5" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   575
-      conf << " ipv6 nd prefix-advertisement" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   576
-      conf << " no ipv6 nd suppress-ra" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   577
-      conf << " ipv6 nd home-agent-config-flag" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   578
-      conf << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   579
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   580
-      conf << "interface sim3" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   581
-      conf << " ipv6 nd ra-interval 5" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   582
-      conf << " ipv6 nd prefix-advertisement" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   583
-      conf << " no ipv6 nd suppress-ra" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   584
-      conf << " ipv6 nd home-agent-config-flag" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   585
-      conf << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   586
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   587
-      conf << "interface sim4" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   588
-      conf << " ipv6 nd ra-interval 5" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   589
-      conf << " ipv6 nd prefix-advertisement" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   590
-      conf << " no ipv6 nd suppress-ra" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   591
-      conf << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   592
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   593
-      conf << "interface sim5" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   594
-      conf << " ipv6 nd ra-interval 5" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   595
-      conf << " ipv6 nd prefix-advertisement" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   596
-      conf << " no ipv6 nd suppress-ra" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   597
-      conf << "!" << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   598
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   599
-#endif
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   600
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   601
-  conf.close ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   602
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   603
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   604
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   605
-void
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   606
-QuaggaHelper::GenerateConfigOspf (Ptr<Node> node)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   607
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   608
-  NS_LOG_FUNCTION (node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   609
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   610
-  Ptr<OspfConfig> ospf_conf = node->GetObject<OspfConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   611
-  Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   612
-  
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   613
-  ospf_conf->m_routerId = 1+node->GetId ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   614
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   615
-  NS_LOG_DEBUG ("ipv4->GetNInterfaces () = " << ipv4->GetNInterfaces ());
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   616
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   617
-  for (uint32_t i = 0; i < ipv4->GetNInterfaces (); i ++)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   618
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   619
-      Ipv4Address addr = ipv4->GetAddress (i, 0).GetLocal ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   620
-      Ipv4Mask mask = ipv4->GetAddress (i, 0).GetMask ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   621
-      Ipv4Address prefix = addr.CombineMask (mask);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   622
-      
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   623
-      NS_LOG_DEBUG ("address: " << addr);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   624
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   625
-      if (addr.IsEqual (Ipv4Address::GetLoopback()))
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   626
-        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   627
-          continue;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   628
-        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   629
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   630
-      ospf_conf->iflist->push_back (i);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   631
-      ospf_conf->addNetwork (prefix, mask.GetPrefixLength (), 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   632
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   633
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   634
-  // config generation
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   635
-  std::stringstream conf_dir, conf_file;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   636
-  // FIXME XXX
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   637
-  conf_dir << "files-" << node->GetId () << "";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   638
-  ::mkdir (conf_dir.str ().c_str (), S_IRWXU | S_IRWXG);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   639
-  conf_dir << "/usr/";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   640
-  ::mkdir (conf_dir.str ().c_str (), S_IRWXU | S_IRWXG);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   641
-  conf_dir << "/local/";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   642
-  ::mkdir (conf_dir.str ().c_str (), S_IRWXU | S_IRWXG);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   643
-  conf_dir << "/etc/";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   644
-  ::mkdir (conf_dir.str ().c_str (), S_IRWXU | S_IRWXG);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   645
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   646
-  conf_file << conf_dir.str() << "/ospfd.conf";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   647
-  ospf_conf->SetFilename ("/usr/local/etc/ospfd.conf");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   648
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   649
-  std::ofstream conf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   650
-  conf.open (conf_file.str ().c_str ());
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   651
-  ospf_conf->Print (conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   652
-  conf.close ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   653
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   654
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   655
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   656
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   657
-ApplicationContainer
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   658
-QuaggaHelper::Install (Ptr<Node> node)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   659
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   660
-  return ApplicationContainer (InstallPriv (node));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   661
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   662
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   663
-ApplicationContainer
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   664
-QuaggaHelper::Install (std::string nodeName)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   665
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   666
-  Ptr<Node> node = Names::Find<Node> (nodeName);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   667
-  return ApplicationContainer (InstallPriv (node));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   668
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   669
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   670
-ApplicationContainer
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   671
-QuaggaHelper::Install (NodeContainer c)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   672
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   673
-  ApplicationContainer apps;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   674
-  for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   675
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   676
-      apps.Add (InstallPriv (*i));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   677
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   678
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   679
-  return apps;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   680
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   681
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   682
-ApplicationContainer
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   683
-QuaggaHelper::InstallPriv (Ptr<Node> node) 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   684
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   685
-  DceApplicationHelper process;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   686
-  ApplicationContainer apps;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   687
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   688
-  Ptr<QuaggaConfig> zebra_conf = node->GetObject<QuaggaConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   689
-  if (!zebra_conf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   690
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   691
-      zebra_conf = new QuaggaConfig ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   692
-      node->AggregateObject (zebra_conf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   693
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   694
-  GenerateConfigZebra (node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   695
-  process.SetBinary ("zebra");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   696
-  process.AddArguments ("-f", zebra_conf->GetFilename ());
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   697
-  process.AddArguments ("-i", "/usr/local/etc/zebra.pid");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   698
-  process.SetStackSize (1<<16);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   699
-  apps.Add (process.Install (node));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   700
-  apps.Get(0)->SetStartTime (Seconds (1.0 + 0.01 * node->GetId ()));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   701
-  node->AddApplication (apps.Get (0));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   702
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   703
-  Ptr<OspfConfig> ospf_conf = node->GetObject<OspfConfig>();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   704
-  // OSPF
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   705
-  if (ospf_conf)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   706
-    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   707
-      GenerateConfigOspf (node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   708
-      process.ResetArguments ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   709
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   710
-      process.SetBinary ("ospfd");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   711
-      process.AddArguments ("-f", ospf_conf->GetFilename ());
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   712
-      process.AddArguments ("-i", "/usr/local/etc/ospfd.pid");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   713
-      apps.Add (process.Install (node));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   714
-      apps.Get(1)->SetStartTime (Seconds (2.0 + 0.1 * node->GetId ()));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   715
-      node->AddApplication (apps.Get (1));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   716
-    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   717
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   718
-  return apps;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   719
-}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   720
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   721
-} // namespace ns3
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   722
diff -r 28c0c7f781c1 helper/quagga-helper.h
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   723
--- a/helper/quagga-helper.h	Thu Mar 29 17:00:46 2012 +0200
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   724
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   725
@@ -1,100 +0,0 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   726
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   727
-/*
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   728
- * Copyright (c) 2010 Hajime Tazaki
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   729
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   730
- * This program is free software; you can redistribute it and/or modify
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   731
- * it under the terms of the GNU General Public License version 2 as
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   732
- * published by the Free Software Foundation;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   733
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   734
- * This program is distributed in the hope that it will be useful,
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   735
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   736
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   737
- * GNU General Public License for more details.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   738
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   739
- * You should have received a copy of the GNU General Public License
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   740
- * along with this program; if not, write to the Free Software
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   741
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   742
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   743
- * Author: Hajime Tazaki <tazaki@sfc.wide.ad.jp>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   744
- */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   745
-#ifndef QUAGGA_HELPER_H
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   746
-#define QUAGGA_HELPER_H
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   747
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   748
-#include "dce-manager-helper.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   749
-#include "dce-application-helper.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   750
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   751
-namespace ns3 {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   752
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   753
-/**
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   754
- * \brief create a quagga routing daemon as an application and associate it to a node
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   755
- *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   756
- * This class creates one or multiple instances of ns3::Quagga and associates
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   757
- * it/them to one/multiple node(s).
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   758
- */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   759
-class QuaggaHelper
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   760
-{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   761
-public:
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   762
-  /**
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   763
-   * Create a QuaggaHelper which is used to make life easier for people wanting
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   764
-   * to use quagga Applications.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   765
-   *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   766
-   */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   767
-  QuaggaHelper ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   768
-  /**
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   769
-   * Install a quagga application on each Node in the provided NodeContainer.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   770
-   *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   771
-   * \param nodes The NodeContainer containing all of the nodes to get a quagga
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   772
-   *              application via ProcessManager.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   773
-   *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   774
-   * \returns A list of quagga applications, one for each input node
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   775
-   */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   776
-  ApplicationContainer Install (NodeContainer nodes);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   777
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   778
-  /**
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   779
-   * Install a quagga application on the provided Node.  The Node is specified
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   780
-   * directly by a Ptr<Node>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   781
-   *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   782
-   * \param node The node to install the QuaggaApplication on.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   783
-   *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   784
-   * \returns An ApplicationContainer holding the quagga application created.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   785
-   */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   786
-  ApplicationContainer Install (Ptr<Node> node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   787
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   788
-  /**
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   789
-   * Install a quagga application on the provided Node.  The Node is specified
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   790
-   * by a string that must have previosly been associated with a Node using the
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   791
-   * Object Name Service.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   792
-   *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   793
-   * \param nodeName The node to install the ProcessApplication on.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   794
-   *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   795
-   * \returns An ApplicationContainer holding the quagga application created.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   796
-   */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   797
-  ApplicationContainer Install (std::string nodeName);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   798
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   799
-  /**
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   800
-   * \brief Configure ping applications attribute 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   801
-   * \param name   attribute's name
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   802
-   * \param value  attribute's value
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   803
-   */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   804
-  void SetAttribute (std::string name, const AttributeValue &value);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   805
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   806
-  void EnableOspf (NodeContainer nodes);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   807
-  void EnableOspfDebug (NodeContainer nodes);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   808
-  void EnableTdpNina (NodeContainer nodes);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   809
-  void EnableZebraDebug (NodeContainer nodes);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   810
-  void EnableRadvd (Ptr<Node> node, const char *ifname);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   811
-  void EnableEgressIF (Ptr<Node> node, const char *ifname);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   812
-  void EnableHomeAgentFlag (Ptr<Node> node, const char *ifname);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   813
-  void UseManualConfig (NodeContainer nodes);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   814
-private:
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   815
-  /**
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   816
-   * \internal
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   817
-   */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   818
-  ApplicationContainer InstallPriv (Ptr<Node> node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   819
-  void GenerateConfigZebra (Ptr<Node> node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   820
-  void GenerateConfigOspf (Ptr<Node> node);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   821
-};
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   822
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   823
-} // namespace ns3
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   824
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   825
-#endif /* QUAGGA_HELPER_H */
13
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   826
diff -r 28c0c7f781c1 model/dce-fd.cc
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   827
--- a/model/dce-fd.cc	Thu Mar 29 17:00:46 2012 +0200
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
   828
+++ b/model/dce-fd.cc	Wed Apr 11 10:56:47 2012 +0900
13
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   829
@@ -345,12 +345,6 @@
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   830
 
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   831
   Ptr<SocketFdFactory>  factory = 0;
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   832
 
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   833
-  if ( domain == AF_INET6 )
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   834
-    {
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   835
-      current->err = EAFNOSUPPORT;
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   836
-      return -1;
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   837
-    }
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   838
-
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   839
   if (domain != AF_UNIX)
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   840
     {
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   841
       factory = manager->GetObject<SocketFdFactory> ();
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   842
diff -r 28c0c7f781c1 model/libc-ns3.h
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   843
--- a/model/libc-ns3.h	Thu Mar 29 17:00:46 2012 +0200
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
   844
+++ b/model/libc-ns3.h	Wed Apr 11 10:56:47 2012 +0900
1
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   845
@@ -412,7 +412,7 @@
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   846
 DCE    (ftruncate)
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   847
 
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   848
 // pwd.h
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   849
-//NATIVE (getpwnam)
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   850
+NATIVE (getpwnam)
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   851
 // grp.h
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   852
 NATIVE (getgrnam)
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   853
 
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   854
@@ -461,7 +461,7 @@
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   855
 NATIVE (__ctype_get_mb_cur_max)
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   856
 
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   857
 // pwd.h
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   858
-DCE (getpwnam)
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   859
+//DCE (getpwnam)
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   860
 DCE (getpwuid)
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   861
 DCE (endpwent)
8604b19f35e5 update for USENIX ATC 2012
Hajime Tazaki <tazaki@nict.go.jp>
parents: 0
diff changeset
   862
 
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   863
diff -r 28c0c7f781c1 model/linux-socket-fd-factory.cc
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   864
--- a/model/linux-socket-fd-factory.cc	Thu Mar 29 17:00:46 2012 +0200
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
   865
+++ b/model/linux-socket-fd-factory.cc	Wed Apr 11 10:56:47 2012 +0900
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   866
@@ -254,6 +254,10 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   867
 {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   868
   LinuxSocketFdFactory *self = (LinuxSocketFdFactory *)kernel;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   869
   TaskManager *manager = TaskManager::Current ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   870
+  if (!manager) 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   871
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   872
+      return 1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   873
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   874
   Task *other = (Task *)self->m_exported->task_get_private (task);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   875
   bool isBlocked = other->IsBlocked ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   876
   manager->Wakeup (other);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   877
@@ -403,6 +407,10 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   878
     {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   879
       flags |= SIM_DEV_BROADCAST;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   880
     }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   881
+  if (!device->NeedsArp ())
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   882
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   883
+      flags |= SIM_DEV_NOARP;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   884
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   885
   struct SimDevice *dev = m_exported->dev_create (PeekPointer (device), (enum SimDevFlags)flags);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   886
 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   887
   Ptr<LinuxDeviceStateListener> listener = Create <LinuxDeviceStateListener> (device, this);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   888
diff -r 28c0c7f781c1 model/utils.cc
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   889
--- a/model/utils.cc	Thu Mar 29 17:00:46 2012 +0200
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
   890
+++ b/model/utils.cc	Wed Apr 11 10:56:47 2012 +0900
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   891
@@ -191,6 +191,11 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   892
 void UtilsDoSignal (void)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   893
 {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   894
   Thread *current = Current ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   895
+  if (!current)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   896
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   897
+      return;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   898
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   899
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   900
   // we try to check if we 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   901
   // have pending signals and we deliver them if we have any.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   902
   for (std::vector<SignalHandler>::iterator i = current->process->signalHandlers.begin (); 
13
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   903
diff -r 28c0c7f781c1 test/dce-manager-test.cc
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   904
--- a/test/dce-manager-test.cc	Thu Mar 29 17:00:46 2012 +0200
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
   905
+++ b/test/dce-manager-test.cc	Wed Apr 11 10:56:47 2012 +0900
13
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   906
@@ -161,13 +161,15 @@
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   907
       {  "test-random", 0, "", false },
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   908
       {  "test-local-socket", 0, "", false },
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   909
       {  "test-poll", 3200, "", true },
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   910
-      {  "test-tcp-socket", 320, "", true },
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   911
+      //      {  "test-tcp-socket", 320, "", true },
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   912
       {  "test-exec", 0, "" , false},
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   913
       /* {  "test-raw-socket", 320, "", true },*/
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   914
       {  "test-iperf", 0, "" , false},
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   915
       {  "test-name", 0, "" , false},
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   916
       {  "test-pipe", 0, "" , false},
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   917
       {  "test-dirent", 0, "" , false},
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
   918
+      {  "test-socket", 30, "" , true},
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
   919
+      {  "test-bug-multi-select", 30, "" , true},
13
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   920
   };
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   921
 
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
   922
   // Prepare directories and files for test-stdio
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   923
diff -r 28c0c7f781c1 test/test-bug-multi-select.cc
0
fdb1fc846d62 add into mq reposistory
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
   924
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
   925
+++ b/test/test-bug-multi-select.cc	Wed Apr 11 10:56:47 2012 +0900
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   926
@@ -0,0 +1,199 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   927
+#include <stdio.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   928
+#include <sys/select.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   929
+#include <sys/types.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   930
+#include <sys/socket.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   931
+#include <netinet/ip.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   932
+#include <string.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   933
+#include <unistd.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   934
+#include <fcntl.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   935
+#include <errno.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   936
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   937
+#define SND_CNT 50
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   938
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   939
+static int
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   940
+sv ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   941
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   942
+  int ret;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   943
+  int accept_sock, sock;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   944
+  struct sockaddr_in addr, client;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   945
+  fd_set readfd;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   946
+  int val;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   947
+  socklen_t len = sizeof (client);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   948
+  char buf[1024];
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   949
+  int i = 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   950
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   951
+#ifdef DEBUG
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   952
+  printf ("Server Start \n");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   953
+#endif
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   954
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   955
+  accept_sock = socket (AF_INET, SOCK_STREAM, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   956
+  if (accept_sock < 0) 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   957
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   958
+      perror ("socket");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   959
+      return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   960
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   961
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   962
+  memset (&addr, 0, sizeof (struct sockaddr_in));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   963
+  addr.sin_family = AF_INET;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   964
+  addr.sin_port = htons (10001);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   965
+  addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   966
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   967
+  ret  = bind (accept_sock, (struct sockaddr *)&addr, 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   968
+	       sizeof (struct sockaddr_in));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   969
+  if (ret < 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   970
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   971
+      perror ("bind");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   972
+      return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   973
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   974
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   975
+  ret = listen (accept_sock, 1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   976
+  if (ret < 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   977
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   978
+      perror ("listen");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   979
+      return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   980
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   981
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   982
+  sock = accept (accept_sock, (struct sockaddr *) &client, &len);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   983
+  if (sock < 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   984
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   985
+      perror ("accept");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   986
+      return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   987
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   988
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   989
+#ifdef DEBUG
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   990
+   printf ("accept\n");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   991
+#endif
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   992
+  val = fcntl (sock, F_GETFL, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   993
+  fcntl (sock, F_SETFL, (val | O_NONBLOCK));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   994
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   995
+  while (1)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   996
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   997
+      struct timeval tv;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   998
+      memset (&tv, 0, sizeof(tv));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
   999
+      tv.tv_sec = 1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1000
+      tv.tv_usec = 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1001
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1002
+      i++;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1003
+      if (i > SND_CNT * 3)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1004
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1005
+          printf ("ERR: Giving up to recv data (try=%d)", i);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1006
+          return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1007
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1008
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1009
+      //      printf ("select\n");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1010
+      FD_ZERO (&readfd);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1011
+      FD_SET (sock, &readfd);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1012
+      // Multiple fds in readfd
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1013
+      FD_SET (accept_sock, &readfd);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1014
+      ret = select (FD_SETSIZE, &readfd, NULL, NULL, &tv);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1015
+      if (ret == 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1016
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1017
+#ifdef DEBUG
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1018
+          printf ("timeout\n");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1019
+#endif
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1020
+          continue;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1021
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1022
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1023
+      if (ret < 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1024
+	{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1025
+          if (errno == EINTR || errno == EAGAIN)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1026
+	    continue;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1027
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1028
+	  perror ("select");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1029
+	  return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1030
+	}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1031
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1032
+      // To increase read buffer
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1033
+      if (i%3 == 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1034
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1035
+          i++;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1036
+          continue;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1037
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1038
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1039
+      ret = read (sock, buf, sizeof(buf));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1040
+      if (ret == 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1041
+        return 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1042
+      else if (ret < 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1043
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1044
+          perror ("read, exit");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1045
+          return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1046
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1047
+#ifdef DEBUG
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1048
+      printf ("recv[%d]: %s\n", i, buf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1049
+#endif
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1050
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1051
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1052
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1053
+#ifdef DEBUG
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1054
+  printf ("Server Stop \n");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1055
+#endif
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1056
+  return 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1057
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1058
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1059
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1060
+static int
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1061
+cl ()
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1062
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1063
+  int ret;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1064
+  int sock;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1065
+  struct sockaddr_in addr;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1066
+  const char buf[512] = "01234567890123456789012345678901234567890123456789\0"; // 50 chars
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1067
+  int i = 0, sndcnt = SND_CNT;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1068
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1069
+#ifdef DEBUG
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1070
+  printf ("Client Start \n");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1071
+#endif
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1072
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1073
+  sock = socket (AF_INET, SOCK_STREAM, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1074
+  if (sock < 0) 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1075
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1076
+      perror ("socket");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1077
+      return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1078
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1079
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1080
+  memset (&addr, 0, sizeof (struct sockaddr_in));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1081
+  addr.sin_family = AF_INET;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1082
+  addr.sin_port = htons (10001);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1083
+  addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1084
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1085
+  ret  = connect (sock, (struct sockaddr *)&addr, 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1086
+                  sizeof (struct sockaddr_in));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1087
+  if (ret < 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1088
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1089
+      perror ("connect");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1090
+      return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1091
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1092
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1093
+  while (i < sndcnt)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1094
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1095
+      ret = write (sock, buf, sizeof(buf));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1096
+      if (ret < 0)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1097
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1098
+          perror ("write");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1099
+          return -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1100
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1101
+      //      printf ("write [%d] \n", i);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1102
+      i++;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1103
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1104
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1105
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1106
+#ifdef DEBUG
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1107
+  printf ("Client Stop \n");
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1108
+#endif
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1109
+  return 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1110
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1111
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1112
+int
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1113
+main (int argc, char *argv[])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1114
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1115
+  if (argc == 1)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1116
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1117
+      return sv ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1118
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1119
+  else
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1120
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1121
+      return cl ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1122
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1123
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1124
+  return 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1125
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1126
diff -r 28c0c7f781c1 test/test-socket.cc
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1127
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
  1128
+++ b/test/test-socket.cc	Wed Apr 11 10:56:47 2012 +0900
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1129
@@ -0,0 +1,395 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1130
+#define _GNU_SOURCE 1
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1131
+#include <sys/types.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1132
+#include <sys/socket.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1133
+#include <netinet/in.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1134
+#include <linux/netlink.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1135
+#include <linux/rtnetlink.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1136
+#include <errno.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1137
+#include <sys/select.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1138
+#include <pthread.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1139
+#include <netinet/ip.h>
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1140
+#include "test-macros.h"
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1141
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1142
+#undef OUTPUT
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1143
+#define OUTPUT(s) (std::cout << s << std::endl)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1144
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1145
+void test_raw (void)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1146
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1147
+  int sock;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1148
+  const char buf[12] = "0123456789\0";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1149
+  struct msghdr msg;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1150
+  struct iovec iov[2];
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1151
+  static struct sockaddr_in dst;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1152
+  int ret;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1153
+  int on = 1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1154
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1155
+  // ICMP Raw sock
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1156
+  sock = socket (AF_INET, SOCK_RAW, IPPROTO_ICMP);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1157
+  TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1158
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1159
+  // sockopt IP_PKTINFO
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1160
+  ret = setsockopt (sock, IPPROTO_IP, IP_PKTINFO, &on, sizeof (on));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1161
+  TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1162
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1163
+  // sendmsg
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1164
+  memset (&dst, 0, sizeof (dst));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1165
+  dst.sin_family = AF_INET;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1166
+  dst.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1167
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1168
+  iov[0].iov_base = (void *) buf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1169
+  iov[0].iov_len = sizeof (buf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1170
+  msg.msg_name = &dst;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1171
+  msg.msg_namelen = sizeof (dst);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1172
+  msg.msg_iov = &iov[0];
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1173
+  msg.msg_iovlen = 1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1174
+  msg.msg_control = NULL;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1175
+  msg.msg_controllen = 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1176
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1177
+  ret = sendmsg (sock, &msg, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1178
+  TEST_ASSERT_EQUAL (ret, sizeof (buf));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1179
+  OUTPUT ("RAW send ret = " << ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1180
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1181
+  // recvmsg with MSG_PEEK
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1182
+  iov[0].iov_base = (void *) buf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1183
+  iov[0].iov_len = 2;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1184
+  ret = recvmsg (sock, &msg, MSG_PEEK);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1185
+  TEST_ASSERT_EQUAL (ret, 2);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1186
+  OUTPUT ("RAW recv PEEK ret = " << ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1187
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1188
+  // recvmsg 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1189
+  struct in_pktinfo *pktinfo;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1190
+  struct cmsghdr *cmsg;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1191
+  char cbuff [sizeof (*cmsg) + sizeof (*pktinfo)];
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1192
+  char buf2[32];
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1193
+  iov[0].iov_base = (void *) buf2;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1194
+  iov[0].iov_len = sizeof (buf2);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1195
+  msg.msg_name = NULL;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1196
+  msg.msg_namelen = 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1197
+  msg.msg_iov = &iov[0];
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1198
+  msg.msg_iovlen = 1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1199
+  msg.msg_control = cbuff;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1200
+  msg.msg_controllen = CMSG_SPACE(sizeof (struct in_pktinfo));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1201
+  ret = recvmsg (sock, &msg, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1202
+  TEST_ASSERT_EQUAL (ret, sizeof (buf2));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1203
+  OUTPUT ("RAW recv ret = " << ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1204
+  //  std::cout <<  "RAW recv ret = " << ret << std::endl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1205
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1206
+  // RECV interface via PKTINFO
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1207
+  cmsg = CMSG_FIRSTHDR (&msg);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1208
+  pktinfo = (struct in_pktinfo *)CMSG_DATA(cmsg);
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
  1209
+  TEST_ASSERT_EQUAL (pktinfo->ipi_ifindex, 1); // Loopback Interface
0
fdb1fc846d62 add into mq reposistory
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
  1210
+
fdb1fc846d62 add into mq reposistory
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
  1211
+
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1212
+  // sockopt IP_HDRINCL
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1213
+  ret = setsockopt (sock, IPPROTO_IP, IP_HDRINCL, &on, sizeof (on));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1214
+  TEST_ASSERT_UNEQUAL (sock, -1);
0
fdb1fc846d62 add into mq reposistory
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
  1215
+
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1216
+  // sendmsg with IP_HDRINCL
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1217
+  struct ip iph;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1218
+  memset (&iph, 0, sizeof (iph));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1219
+  iph.ip_hl = sizeof (struct ip) >> 2;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1220
+  iph.ip_src = dst.sin_addr;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1221
+  iph.ip_dst = dst.sin_addr;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1222
+  iph.ip_p = IPPROTO_ICMP;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1223
+  iph.ip_len = iph.ip_hl*4 + sizeof (buf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1224
+  iov[0].iov_base = (char*)&iph;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1225
+  iov[0].iov_len = iph.ip_hl * 4;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1226
+  iov[1].iov_base = (void *) buf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1227
+  iov[1].iov_len = sizeof (buf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1228
+  msg.msg_name = &dst;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1229
+  msg.msg_namelen = sizeof (dst);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1230
+  msg.msg_iov = iov;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1231
+  msg.msg_iovlen = 2;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1232
+  msg.msg_control = NULL;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1233
+  msg.msg_controllen = 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1234
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1235
+  ret = sendmsg (sock, &msg, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1236
+  // XXX: FIXME to handle header size
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1237
+  TEST_ASSERT_EQUAL (ret, (int)sizeof (buf) + iph.ip_hl * 4);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1238
+  //  TEST_ASSERT_EQUAL (ret, (int)sizeof (buf) + );
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1239
+  OUTPUT ("RAW send ret = " << ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1240
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1241
+  // recvmsg with long buf
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1242
+  char recvbuf[512];
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1243
+  iov[0].iov_base = (void *) recvbuf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1244
+  iov[0].iov_len = sizeof (recvbuf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1245
+  ret = recvmsg (sock, &msg, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1246
+  TEST_ASSERT_EQUAL (ret, sizeof (buf) + 20);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1247
+  OUTPUT ("RAW recv ret = " << ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1248
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1249
+  // close
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1250
+  // FIXME!! close () cause WakeupSend and died cause non-context switching
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1251
+  // close (sock);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1252
+  // TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1253
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1254
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1255
+void test_udp (void)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1256
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1257
+  int sock;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1258
+  const char buf[12] = "0123456789\0";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1259
+  struct msghdr msg;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1260
+  struct iovec iov;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1261
+  static struct sockaddr_in dst;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1262
+  int ret;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1263
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1264
+  // UDP Sock
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1265
+  sock = socket (AF_INET, SOCK_DGRAM, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1266
+  TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1267
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1268
+  memset (&dst, 0, sizeof (dst));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1269
+  dst.sin_family = AF_INET;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1270
+  dst.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1271
+  dst.sin_port = htons (30);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1272
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1273
+  // bind
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1274
+  ret = bind (sock, (struct sockaddr *)&dst, sizeof (dst));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1275
+  TEST_ASSERT_UNEQUAL (ret, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1276
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1277
+  // sendmsg
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1278
+  iov.iov_base = (void *) buf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1279
+  iov.iov_len = sizeof (buf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1280
+  msg.msg_name = &dst;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1281
+  msg.msg_namelen = sizeof (dst);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1282
+  msg.msg_iov = &iov;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1283
+  msg.msg_iovlen = 1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1284
+  msg.msg_control = NULL;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1285
+  msg.msg_controllen = 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1286
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1287
+  ret = sendmsg (sock, &msg, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1288
+  TEST_ASSERT_EQUAL (ret, sizeof (buf));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1289
+  OUTPUT ("UDP send ret = " << ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1290
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1291
+  // recvmsg
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1292
+  iov.iov_base = (void *) buf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1293
+  iov.iov_len = sizeof (buf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1294
+  ret = recvmsg (sock, &msg, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1295
+  TEST_ASSERT_EQUAL (ret, sizeof (buf));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1296
+  OUTPUT ("UDP recv ret = " << ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1297
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1298
+  // close
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1299
+  close (sock);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1300
+  TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1301
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1302
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1303
+static void *
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1304
+thread_recv (void *arg)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1305
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1306
+  int accept_sock = -1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1307
+  int sock = *(int *)arg;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1308
+  int ret;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1309
+  char buf[12];
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1310
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1311
+  while (1)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1312
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1313
+      fd_set readfd;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1314
+      struct timeval wait;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1315
+      FD_ZERO (&readfd);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1316
+      if (accept_sock == -1)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1317
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1318
+          FD_SET (sock, &readfd);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1319
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1320
+      else
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1321
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1322
+          FD_SET (accept_sock, &readfd);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1323
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1324
+      wait.tv_sec = 1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1325
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1326
+      ret = select (FD_SETSIZE, &readfd, NULL, NULL, &wait);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1327
+      TEST_ASSERT_UNEQUAL (ret, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1328
+      if (errno == EINTR || errno == EAGAIN)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1329
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1330
+          continue;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1331
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1332
+      TEST_ASSERT_UNEQUAL (ret, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1333
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1334
+      // accept
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1335
+      if (accept_sock == -1)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1336
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1337
+          accept_sock = accept (sock, NULL, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1338
+          TEST_ASSERT_UNEQUAL (ret, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1339
+          OUTPUT ("TCP accepted ret = " << ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1340
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1341
+      else
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1342
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1343
+          break;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1344
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1345
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1346
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1347
+  // recv
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1348
+  ret = recv (accept_sock, &buf, sizeof (buf), 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1349
+  TEST_ASSERT_EQUAL (ret, sizeof (buf));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1350
+  OUTPUT ("TCP recv ret = " << ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1351
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1352
+  pthread_exit (arg);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1353
+  // never reached.
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1354
+  TEST_ASSERT (false);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1355
+  return arg;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1356
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1357
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1358
+void test_tcp (void)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1359
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1360
+  int sock, tx_sock;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1361
+  const char buf[12] = "0123456789\0";
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1362
+  static struct sockaddr_in dst;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1363
+  int ret;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1364
+  pthread_t thread;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1365
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1366
+  // TCP Sock
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1367
+  sock = socket (AF_INET, SOCK_STREAM, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1368
+  TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1369
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1370
+  memset (&dst, 0, sizeof (dst));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1371
+  dst.sin_family = AF_INET;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1372
+  dst.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1373
+  dst.sin_port = htons (30);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1374
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1375
+  // bind
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1376
+  ret = bind (sock, (struct sockaddr *)&dst, sizeof (dst));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1377
+  TEST_ASSERT_UNEQUAL (ret, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1378
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1379
+  // listen
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1380
+  ret = listen (sock, 5);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1381
+  TEST_ASSERT_UNEQUAL (ret, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1382
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1383
+  // recv thread
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1384
+  ret = pthread_create (&thread, NULL, 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1385
+                        &thread_recv,
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1386
+                        (void*)&sock);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1387
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1388
+  // tx sock
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1389
+  tx_sock = socket (AF_INET, SOCK_STREAM, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1390
+  TEST_ASSERT_UNEQUAL (tx_sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1391
+  // connect
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1392
+  ret = connect (tx_sock, (struct sockaddr *)&dst, sizeof (dst));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1393
+  TEST_ASSERT_UNEQUAL (ret, -1);
0
fdb1fc846d62 add into mq reposistory
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
  1394
+
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1395
+  // send
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1396
+  ret = send (tx_sock, &buf, sizeof (buf), 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1397
+  TEST_ASSERT_EQUAL (ret, sizeof (buf));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1398
+  OUTPUT ("TCP send ret = " << ret);
0
fdb1fc846d62 add into mq reposistory
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
  1399
+
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1400
+  void *return_value;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1401
+  ret = pthread_join (thread, &return_value);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1402
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1403
+  // close
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1404
+  close (sock);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1405
+  TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1406
+  close (tx_sock);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1407
+  TEST_ASSERT_UNEQUAL (tx_sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1408
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1409
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1410
+void test_netlink (void)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1411
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1412
+  int sock;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1413
+  int ret;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1414
+  struct sockaddr_nl snl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1415
+  socklen_t namelen;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1416
+  int seq = 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1417
+  char buf[4096];
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1418
+  struct iovec iov;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1419
+  struct msghdr msg;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1420
+  struct nlmsghdr *h;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1421
+  struct ifaddrmsg *ifa;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1422
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1423
+  // Netlink sock
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1424
+  sock = socket (AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1425
+  TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1426
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1427
+  // Bind
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1428
+  memset (&snl, 0, sizeof snl);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1429
+  snl.nl_family = AF_NETLINK;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1430
+  snl.nl_groups = RTMGRP_LINK|RTMGRP_IPV4_ROUTE|RTMGRP_IPV4_IFADDR;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1431
+  ret = bind (sock, (struct sockaddr *) &snl, sizeof snl);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1432
+  TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1433
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1434
+  // getsockname
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1435
+  namelen = sizeof (snl);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1436
+  ret = getsockname (sock, (struct sockaddr *) &snl, &namelen);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1437
+  TEST_ASSERT_UNEQUAL (ret, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1438
+  TEST_ASSERT_EQUAL (namelen, sizeof (snl));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1439
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1440
+  // sendto
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1441
+  struct
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1442
+  {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1443
+    struct nlmsghdr nlh;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1444
+    struct rtgenmsg g;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1445
+  } req;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1446
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1447
+  memset (&snl, 0, sizeof snl);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1448
+  snl.nl_family = AF_NETLINK;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1449
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1450
+  // Get IPv4 Address
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1451
+  req.nlh.nlmsg_len = sizeof (req);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1452
+  req.nlh.nlmsg_type = RTM_GETADDR;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1453
+  req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1454
+  req.nlh.nlmsg_pid = 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1455
+  req.nlh.nlmsg_seq = ++seq;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1456
+  req.g.rtgen_family = AF_INET;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1457
+ 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1458
+  ret = sendto (sock, (void *) &req, sizeof (req), 0, 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1459
+                (struct sockaddr *) &snl, sizeof (snl));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1460
+  TEST_ASSERT_EQUAL (ret, sizeof (req));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1461
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1462
+  // recvmsg
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1463
+  iov.iov_base = (void *) buf;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1464
+  iov.iov_len = sizeof (buf);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1465
+  msg.msg_name = (void *)&snl;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1466
+  msg.msg_namelen = sizeof (snl);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1467
+  msg.msg_iov = &iov;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1468
+  msg.msg_iovlen = 1;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1469
+  msg.msg_control = NULL;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1470
+  msg.msg_controllen = 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1471
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1472
+  ret = recvmsg (sock, &msg, 0);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1473
+  TEST_ASSERT_UNEQUAL (ret, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1474
+  TEST_ASSERT_EQUAL (msg.msg_namelen, sizeof (snl));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1475
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1476
+  // Code from zebra/rt_netlink.c
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1477
+  for (h = (struct nlmsghdr *) buf; NLMSG_OK (h, (uint32_t) ret);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1478
+       h = NLMSG_NEXT (h, ret))
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1479
+    {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1480
+      if (h->nlmsg_type == NLMSG_DONE)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1481
+        break;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1482
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1483
+      /* Error handling. */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1484
+      if (h->nlmsg_type == NLMSG_ERROR)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1485
+        {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1486
+          struct nlmsgerr *err = (struct nlmsgerr *) NLMSG_DATA (h);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1487
+          /* If the error field is zero, then this is an ACK */
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1488
+          if (err->error == 0) 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1489
+            {
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1490
+              // ACK
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1491
+              /* return if not a multipart message, otherwise continue */  
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1492
+              if (!(h->nlmsg_flags & NLM_F_MULTI)) 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1493
+                { 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1494
+                  break;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1495
+                }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1496
+              continue; 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1497
+            }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1498
+          
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1499
+          TEST_ASSERT (h->nlmsg_len >= NLMSG_LENGTH (sizeof (struct nlmsgerr)));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1500
+        }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1501
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1502
+      ifa = (struct ifaddrmsg *) NLMSG_DATA (h);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1503
+      TEST_ASSERT (ifa->ifa_family == AF_INET || ifa->ifa_family == AF_INET6);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1504
+      OUTPUT ("NL: family =  " << (int)ifa->ifa_family);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1505
+    
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1506
+      TEST_ASSERT (h->nlmsg_type == RTM_NEWADDR || h->nlmsg_type == RTM_DELADDR);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1507
+      TEST_ASSERT (h->nlmsg_len - NLMSG_LENGTH(sizeof (struct ifaddrmsg) >= 0));
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1508
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1509
+      // We didn't get into detail to parse attribute
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1510
+    }
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1511
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1512
+  close (sock);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1513
+  TEST_ASSERT_UNEQUAL (sock, -1);
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1514
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1515
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1516
+
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1517
+int main (int argc, char *argv[])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1518
+{
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1519
+  test_raw ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1520
+  test_udp ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1521
+  test_tcp ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1522
+  test_netlink ();
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1523
+  return 0;
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1524
+}
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1525
diff -r 28c0c7f781c1 test/wscript
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1526
--- a/test/wscript	Thu Mar 29 17:00:46 2012 +0200
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
  1527
+++ b/test/wscript	Wed Apr 11 10:56:47 2012 +0900
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1528
@@ -31,6 +31,8 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1529
     new_test(bld, 'test-netdb', '')
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1530
     new_test(bld, 'test-env', '')
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1531
     new_test(bld, 'test-cond', 'PTHREAD')
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1532
+    new_test(bld, 'test-socket', 'PTHREAD')
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1533
+    new_test(bld, 'test-bug-multi-select', 'PTHREAD')
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1534
     new_test(bld, 'test-timer-fd', '')
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1535
     new_test(bld, 'test-stdlib', '')
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1536
     new_test(bld, 'test-select', 'PTHREAD')
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1537
diff -r 28c0c7f781c1 utils/setenv.sh
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1538
--- a/utils/setenv.sh	Thu Mar 29 17:00:46 2012 +0200
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
  1539
+++ b/utils/setenv.sh	Wed Apr 11 10:56:47 2012 +0900
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1540
@@ -1,6 +1,6 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1541
 #!/bin/bash
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1542
 # Set environnement for ns3 dce
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1543
-cd `dirname $BASH_SOURCE`/../
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1544
+cd `dirname ${BASH_SOURCE:-$0}`/../
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1545
 BASEDCE=$PWD
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1546
 cd ..
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1547
 BASE=$PWD
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1548
diff -r 28c0c7f781c1 wscript
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1549
--- a/wscript	Thu Mar 29 17:00:46 2012 +0200
18
1811be862c59 update test
Hajime Tazaki <tazaki@nict.go.jp>
parents: 14
diff changeset
  1550
+++ b/wscript	Wed Apr 11 10:56:47 2012 +0900
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1551
@@ -26,6 +26,7 @@
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1552
     ns3waf.check_modules(conf, ['point-to-point', 'tap-bridge', 'netanim'], mandatory = False)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1553
     ns3waf.check_modules(conf, ['wifi', 'point-to-point', 'csma', 'mobility'], mandatory = False)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1554
     ns3waf.check_modules(conf, ['point-to-point-layout'], mandatory = False)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1555
+    ns3waf.check_modules(conf, ['topology-read', 'applications'], mandatory = False)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1556
     conf.check_tool('compiler_cc')
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1557
     conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H', mandatory=False)
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1558
     conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H', mandatory=False)
13
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1559
@@ -163,7 +164,9 @@
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1560
              ['test-iperf', []],
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1561
              ['test-name', []],
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1562
              ['test-pipe', []],
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1563
-             ['test-dirent', []]
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1564
+             ['test-dirent', []],
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1565
+             ['test-socket', []],
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1566
+             ['test-bug-multi-select', []],
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1567
              ]
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1568
     for name,uselib in tests:
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1569
         module.add_test(**dce_kw(target='bin_dce/' + name, source = ['test/' + name + '.cc'],
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1570
@@ -235,10 +238,6 @@
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1571
                        target='bin/dce-iperf',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1572
                        source=['example/dce-iperf.cc', 'example/ccnx/misc-tools.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1573
     
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1574
-    module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'point-to-point-layout'],
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1575
-                       target='bin/dce-zebra-simple',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1576
-                       source=['example/dce-zebra-simple.cc'])
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1577
-
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1578
     module.add_example(needed = ['core', 'internet', 'dce' ], 
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1579
                        target='bin/dce-bash-simple',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1580
                        source=['example/bash/dce-bash-simple.cc'])
13
6f0c08a6f26a update patches
Hajime Tazaki <tazaki@nict.go.jp>
parents: 12
diff changeset
  1581
@@ -380,7 +379,6 @@
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1582
         'helper/ipv4-dce-routing-helper.cc',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1583
         'helper/dce-manager-helper.cc',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1584
         'helper/dce-application-helper.cc',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1585
-        'helper/quagga-helper.cc',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1586
         'helper/ccn-client-helper.cc'
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1587
         ]
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1588
     module_headers = [
14
6f4976897048 add ipv4-dce-routing-helper to install
Hajime Tazaki <tazaki@nict.go.jp>
parents: 13
diff changeset
  1589
@@ -393,8 +391,8 @@
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1590
         'model/ipv4-dce-routing.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1591
         'helper/dce-manager-helper.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1592
         'helper/dce-application-helper.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1593
-        'helper/quagga-helper.h',
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1594
         'helper/ccn-client-helper.h',
14
6f4976897048 add ipv4-dce-routing-helper to install
Hajime Tazaki <tazaki@nict.go.jp>
parents: 13
diff changeset
  1595
+        'helper/ipv4-dce-routing-helper.h',
12
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1596
         ]
9819db4db001 clean up for dce-quagga
Hajime Tazaki <tazaki@nict.go.jp>
parents: 5
diff changeset
  1597
     module_source = module_source + kernel_source
14
6f4976897048 add ipv4-dce-routing-helper to install
Hajime Tazaki <tazaki@nict.go.jp>
parents: 13
diff changeset
  1598
     module_headers = module_headers + kernel_headers