summaryrefslogtreecommitdiffstats
path: root/vpp-japi/japi
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2015-12-08 15:45:58 -0700
committerEd Warnicke <eaw@cisco.com>2015-12-08 15:47:27 -0700
commitcb9cadad578297ffd78fa8a33670bdf1ab669e7e (patch)
tree6ac2be912482cc7849a26f0ab845561c3d7f4e26 /vpp-japi/japi
parentfb0815d4ae4bb0fe27bd9313f34b45c8593b907e (diff)
Initial commit of vpp code.v1.0.0
Change-Id: Ib246f1fbfce93274020ee93ce461e3d8bd8b9f17 Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'vpp-japi/japi')
-rw-r--r--vpp-japi/japi/org/openvpp/vppjapi/vppApiCallbacks.java27
-rw-r--r--vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java30
-rw-r--r--vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java21
-rw-r--r--vpp-japi/japi/org/openvpp/vppjapi/vppConn.java89
-rw-r--r--vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceCounters.java77
-rw-r--r--vpp-japi/japi/org/openvpp/vppjapi/vppL2Fib.java34
-rw-r--r--vpp-japi/japi/org/openvpp/vppjapi/vppVersion.java32
-rw-r--r--vpp-japi/japi/test/demo.java177
-rw-r--r--vpp-japi/japi/test/vppApi.java37
-rw-r--r--vpp-japi/japi/vppjni.c1737
-rw-r--r--vpp-japi/japi/vppjni.h277
-rw-r--r--vpp-japi/japi/vppjni_bridge_domain.h510
12 files changed, 3048 insertions, 0 deletions
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppApiCallbacks.java b/vpp-japi/japi/org/openvpp/vppjapi/vppApiCallbacks.java
new file mode 100644
index 00000000000..38c7c4e744b
--- /dev/null
+++ b/vpp-japi/japi/org/openvpp/vppjapi/vppApiCallbacks.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+import org.openvpp.vppjapi.vppApi;
+
+public abstract class vppApiCallbacks extends vppApi {
+ public abstract void interfaceDetails(
+ int ifIndex, String interfaceName, int supIfIndex, byte[] physAddr,
+ byte adminUp, byte linkUp, byte linkDuplex, byte linkSpeed,
+ int subId, byte subDot1ad, byte subNumberOfTags, int subOuterVlanId, int subInnerVlanId,
+ byte subExactMatch, byte subDefault, byte subOuterVlanIdAny, byte subInnerVlanIdAny,
+ int vtrOp, int vtrPushDot1q, int vtrTag1, int vtrTag2);
+
+}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java b/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java
new file mode 100644
index 00000000000..01fe11d61a2
--- /dev/null
+++ b/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainDetails.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+import org.openvpp.vppjapi.vppBridgeDomainInterfaceDetails;
+
+public class vppBridgeDomainDetails {
+ public String name;
+ public int bdId;
+ public boolean flood;
+ public boolean uuFlood;
+ public boolean forward;
+ public boolean learn;
+ public boolean arpTerm;
+ public String bviInterfaceName;
+ public vppBridgeDomainInterfaceDetails[] interfaces;
+}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java b/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java
new file mode 100644
index 00000000000..f17c0620106
--- /dev/null
+++ b/vpp-japi/japi/org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public class vppBridgeDomainInterfaceDetails {
+ public String interfaceName;
+ public byte splitHorizonGroup;
+}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppConn.java b/vpp-japi/japi/org/openvpp/vppjapi/vppConn.java
new file mode 100644
index 00000000000..12a3f179695
--- /dev/null
+++ b/vpp-japi/japi/org/openvpp/vppjapi/vppConn.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.Set;
+
+import org.openvpp.vppjapi.vppVersion;
+import org.openvpp.vppjapi.vppInterfaceCounters;
+import org.openvpp.vppjapi.vppBridgeDomainDetails;
+import org.openvpp.vppjapi.vppL2Fib;
+
+public class vppConn {
+ private static final String LIBNAME = "libvppjni.so.0.0.0";
+
+ static {
+ try {
+ loadLibrary();
+ } catch (IOException | RuntimeException e) {
+ System.out.printf ("Can't find vpp jni library: %s\n", LIBNAME);
+ }
+ }
+
+ private static void loadStream(final InputStream is) throws IOException {
+ final Set<PosixFilePermission> perms = PosixFilePermissions.fromString("rwxr-x---");
+ final Path p = Files.createTempFile(LIBNAME, null, PosixFilePermissions.asFileAttribute(perms));
+
+ try {
+ Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
+
+ try {
+ Runtime.getRuntime().load(p.toString());
+ } catch (UnsatisfiedLinkError e) {
+ throw new IOException(String.format("Failed to load library %s", p), e);
+ }
+ } finally {
+ try {
+ Files.deleteIfExists(p);
+ } catch (IOException e) {
+ }
+ }
+ }
+
+ private static void loadLibrary() throws IOException {
+ try (final InputStream is = vppConn.class.getResourceAsStream('/' + LIBNAME)) {
+ if (is == null) {
+ throw new IOException(String.format("Failed to open library resource %s",
+ LIBNAME));
+ }
+ loadStream(is);
+ }
+ }
+
+ public native int clientConnect(String clientName);
+ public native void clientDisconnect();
+ public native int getRetval(int context, int release);
+ public native String getInterfaceList (String nameFilter);
+ public native int swIfIndexFromName (String interfaceName);
+ public native String interfaceNameFromSwIfIndex (int swIfIndex);
+ public native void clearInterfaceTable ();
+ public native int swInterfaceDump (byte nameFilterValid, byte [] nameFilter);
+ public native int bridgeDomainIdFromName(String bridgeDomain);
+ public native int findOrAddBridgeDomainId(String bridgeDomain);
+ public native vppVersion getVppVersion();
+ public native vppInterfaceCounters getInterfaceCounters(int swIfIndex);
+ public native int[] bridgeDomainDump(int bdId);
+ public native vppBridgeDomainDetails getBridgeDomainDetails(int bdId);
+ public native vppL2Fib[] l2FibTableDump(int bdId);
+ public native int bridgeDomainIdFromInterfaceName(String interfaceName);
+}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceCounters.java b/vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceCounters.java
new file mode 100644
index 00000000000..1777d5d5691
--- /dev/null
+++ b/vpp-japi/japi/org/openvpp/vppjapi/vppInterfaceCounters.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public class vppInterfaceCounters {
+
+ public long rxOctets;
+ public long rxIp4;
+ public long rxIp6;
+ public long rxUnicast;
+ public long rxMulticast;
+ public long rxBroadcast;
+ public long rxDiscard;
+ public long rxFifoFull;
+ public long rxError;
+ public long rxUnknownProto;
+ public long rxMiss;
+
+ public long txOctets;
+ public long txIp4;
+ public long txIp6;
+ public long txUnicast;
+ public long txMulticast;
+ public long txBroadcast;
+ public long txDiscard;
+ public long txFifoFull;
+ public long txError;
+ public long txUnknownProto;
+ public long txMiss;
+
+ public vppInterfaceCounters(
+ long rxOctets, long rxIp4, long rxIp6, long rxUni, long rxMulti,
+ long rxBcast, long rxDiscard, long rxFifoFull, long rxError,
+ long rxUnknownProto, long rxMiss,
+ long txOctets, long txIp4, long txIp6, long txUni, long txMulti,
+ long txBcast, long txDiscard, long txFifoFull, long txError,
+ long txUnknownProto, long txMiss)
+ {
+ this.rxOctets = rxOctets;
+ this.rxIp4 = rxIp4;
+ this.rxIp6 = rxIp6;
+ this.rxUnicast = rxUni;
+ this.rxMulticast = rxMulti;
+ this.rxBroadcast = rxBcast;
+ this.rxDiscard = rxDiscard;
+ this.rxFifoFull = rxFifoFull;
+ this.rxError = rxError;
+ this.rxUnknownProto = rxUnknownProto;
+ this.rxMiss = rxMiss;
+
+ this.txOctets = txOctets;
+ this.txIp4 = txIp4;
+ this.txIp6 = txIp6;
+ this.txUnicast = txUni;
+ this.txMulticast = txMulti;
+ this.txBroadcast = txBcast;
+ this.txDiscard = txDiscard;
+ this.txFifoFull = txFifoFull;
+ this.txError = txError;
+ this.txUnknownProto = txUnknownProto;
+ this.txMiss = txMiss;
+ }
+}
+
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppL2Fib.java b/vpp-japi/japi/org/openvpp/vppjapi/vppL2Fib.java
new file mode 100644
index 00000000000..9f43449d63a
--- /dev/null
+++ b/vpp-japi/japi/org/openvpp/vppjapi/vppL2Fib.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public class vppL2Fib {
+ public byte[] physAddress;
+ public boolean staticConfig;
+ public String outgoingInterface;
+ public boolean filter;
+ public boolean bridgedVirtualInterface;
+
+ public vppL2Fib(byte[] _physAddress, boolean _staticConfig,
+ String _outgoingInterface, boolean _filter,
+ boolean _bridgedVirtualInterface) {
+ physAddress = _physAddress;
+ staticConfig = _staticConfig;
+ outgoingInterface = _outgoingInterface;
+ filter = _filter;
+ bridgedVirtualInterface = _bridgedVirtualInterface;
+ }
+}
diff --git a/vpp-japi/japi/org/openvpp/vppjapi/vppVersion.java b/vpp-japi/japi/org/openvpp/vppjapi/vppVersion.java
new file mode 100644
index 00000000000..557ca7b79ee
--- /dev/null
+++ b/vpp-japi/japi/org/openvpp/vppjapi/vppVersion.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openvpp.vppjapi;
+
+public class vppVersion {
+ public String programName;
+ public String buildDirectory;
+ public String gitBranch;
+ public String buildDate;
+
+ public vppVersion(String _progName, String _buildDir, String _gitBranch, String _buildDate)
+ {
+ programName = _progName;
+ buildDirectory = _buildDir;
+ gitBranch = _gitBranch;
+ buildDate = _buildDate;
+ }
+}
+
diff --git a/vpp-japi/japi/test/demo.java b/vpp-japi/japi/test/demo.java
new file mode 100644
index 00000000000..ef419d70658
--- /dev/null
+++ b/vpp-japi/japi/test/demo.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.openvpp.vppjapi.*;
+
+public class demo extends vppApi {
+ public static void main (String[] args) throws Exception {
+ vppApi api = new vppApi ();
+ String intlist;
+ int [] contexts;
+ int i, limit;
+ int trips;
+ int rv, errors, saved_error;
+ long before, after;
+
+ rv = api.clientConnect ("JavaTest");
+ if (rv == 0)
+ System.out.printf ("Connected OK...");
+ else
+ {
+ System.out.printf ("clientConnect returned %d\n", rv);
+ System.exit (1);
+ }
+
+ if (false)
+ {
+ intlist = api.getInterfaceList ("");
+ System.out.printf ("Unfiltered interface list:\n%s", intlist);
+
+ trips = 0;
+
+ contexts = new int[6];
+
+ for (i = 0; i < 6; i++)
+ {
+ contexts[i] = api.swInterfaceSetFlags
+ (5 + i /* sw_if_index */,
+ (byte)1 /* admin_up */,
+ (byte)1 /* link_up (ignored) */,
+ (byte)0 /* deleted */);
+ }
+
+ /* Thread.sleep (1); */
+ errors = 0;
+ saved_error = 0;
+
+ for (i = 0; i < 6; i ++)
+ {
+ while (true)
+ {
+ rv = api.getRetval (contexts[i], 1 /* release */);
+ if (rv != -77)
+ break;
+ Thread.sleep (1);
+ trips++;
+ }
+ if (rv < 0)
+ {
+ saved_error = rv;
+ errors++;
+ }
+ }
+
+ if (errors == 0)
+ System.out.printf ("intfcs up...\n");
+ else
+ System.out.printf
+ ("%d errors, last error %d...\n", errors, saved_error);
+ }
+
+ limit = 250000;
+ saved_error = 0;
+ errors = 0;
+ contexts = new int [limit];
+ byte [] address = new byte [4];
+ byte [] zeros = new byte [4];
+
+ address[0] = (byte)192;
+ address[1] = (byte)168;
+ address[2] = (byte)2;
+ address[3] = (byte)1;
+
+ for (i = 0; i < 4; i++)
+ zeros[i] = 0;
+
+ System.out.printf ("start %d route ops ...", limit);
+
+ before = System.currentTimeMillis();
+
+ for (i = 0; i < limit; i++) {
+ contexts[i] = api.ipAddDelRoute
+ (0 /* int nextHopSwIfIndex */,
+ 0 /* int vrfId */,
+ 0 /* int lookupInVrf */,
+ 0 /* int resolveAttempts */,
+ 0 /* int classifyTableIndex */,
+ (byte)0 /* byte createVrfIfNeeded */,
+ (byte)0 /* byte resolveIfNeeded */,
+ (byte)1 /* byte isAdd */,
+ (byte)1 /* byte isDrop */,
+ (byte)0 /* byte isIpv6 */,
+ (byte)0 /* byte isLocal */,
+ (byte)0 /* byte isClassify */,
+ (byte)0 /* byte isMultipath */,
+ (byte)0 /* byte notLast */,
+ (byte)0 /* byte nextHopWeight */,
+ (byte)32 /* byte dstAddressLength */,
+ address,
+ zeros);
+
+ address[3] += 1;
+ if (address[3] == 0)
+ {
+ address[2] += 1;
+ if (address[2] == 0)
+ {
+ address[1] += 1;
+ {
+ if (address[1] == 0)
+ {
+ address[0] += 1;
+ }
+ }
+ }
+ }
+ }
+
+ trips = 0;
+
+ for (i = 0; i < limit; i++)
+ {
+ while (true)
+ {
+ rv = api.getRetval (contexts[i], 1 /* release */);
+ if (rv != -77)
+ break;
+ Thread.sleep (1);
+ trips++;
+ }
+ if (rv < 0)
+ {
+ saved_error = rv;
+ errors++;
+ }
+ }
+
+ after = System.currentTimeMillis();
+
+
+ if (errors == 0)
+ System.out.printf ("done %d route ops (all OK)...\n", limit);
+ else
+ System.out.printf
+ ("%d errors, last error %d...\n", errors, saved_error);
+
+ System.out.printf ("result in %d trips\n", trips);
+
+ System.out.printf ("%d routes in %d milliseconds, %d routes/msec\n",
+ limit, after - before,
+ limit / (after - before));
+
+ api.clientDisconnect();
+ System.out.printf ("Done...\n");
+ }
+}
diff --git a/vpp-japi/japi/test/vppApi.java b/vpp-japi/japi/test/vppApi.java
new file mode 100644
index 00000000000..a317007f989
--- /dev/null
+++ b/vpp-japi/japi/test/vppApi.java
@@ -0,0 +1,37 @@
+import java.net.InetAddress;
+import org.openvpp.vppjapi.*;
+
+public class vppApi extends vppConn {
+
+ native int controlPing();
+ native void test (byte[] array, byte[] array2);
+
+ public static void main (String[] args) throws Exception {
+ vppApi api = new vppApi ();
+ String ipv6 = "db01::feed";
+ String ipv4 = "192.168.1.1";
+ InetAddress addr6 = InetAddress.getByName(ipv6);
+ InetAddress addr4 = InetAddress.getByName(ipv4);
+ byte[] ip4bytes = addr4.getAddress();
+ byte[] ip6bytes = addr6.getAddress();
+ int rv;
+
+ api.test(ip4bytes,ip6bytes);
+
+ rv = api.clientConnect ("JavaTest");
+ if (rv == 0)
+ System.out.printf ("Connected OK...");
+ else
+ {
+ System.out.printf ("clientConnect returned %d\n", rv);
+ System.exit (1);
+ }
+ rv = api.controlPing();
+ System.out.printf ("data plane pid is %d\n", rv);
+
+ Thread.sleep (5000);
+
+ api.clientDisconnect();
+ System.out.printf ("Done...\n");
+ }
+}
diff --git a/vpp-japi/japi/vppjni.c b/vpp-japi/japi/vppjni.c
new file mode 100644
index 00000000000..65c26403a1d
--- /dev/null
+++ b/vpp-japi/japi/vppjni.c
@@ -0,0 +1,1737 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <vnet/vnet.h>
+
+#define vl_api_version(n,v) static u32 vpe_api_version = (v);
+#include <api/vpe.api.h>
+#undef vl_api_version
+
+#include <jni.h>
+#include <japi/vppjni.h>
+#include <japi/vppjni_bridge_domain.h>
+#include <japi/org_openvpp_vppjapi_vppConn.h>
+#include <japi/org_openvpp_vppjapi_vppApi.h>
+
+#include <api/vpe_msg_enum.h>
+#define vl_typedefs /* define message structures */
+#include <api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+#define vl_endianfun
+#include <api/vpe_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <api/vpe_all_api_h.h>
+#undef vl_printfun
+
+static int connect_to_vpe(char *name);
+
+/*
+ * The Java runtime isn't compile w/ -fstack-protector,
+ * so we have to supply missing external references for the
+ * regular vpp libraries. Weak reference in case folks get religion
+ * at a later date...
+ */
+void __stack_chk_guard (void) __attribute__((weak));
+void __stack_chk_guard (void) { }
+
+void vl_client_add_api_signatures (vl_api_memclnt_create_t *mp)
+{
+ /*
+ * Send the main API signature in slot 0. This bit of code must
+ * match the checks in ../vpe/api/api.c: vl_msg_api_version_check().
+ */
+ mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version);
+}
+
+/* Note: non-static, called once to set up the initial intfc table */
+static int sw_interface_dump (vppjni_main_t * jm)
+{
+ vl_api_sw_interface_dump_t *mp;
+ f64 timeout;
+ hash_pair_t * p;
+ name_sort_t * nses = 0, * ns;
+ sw_interface_subif_t * sub = NULL;
+
+ /* Toss the old name table */
+ hash_foreach_pair (p, jm->sw_if_index_by_interface_name,
+ ({
+ vec_add2 (nses, ns, 1);
+ ns->name = (u8 *)(p->key);
+ ns->value = (u32) p->value[0];
+ }));
+
+ hash_free (jm->sw_if_index_by_interface_name);
+
+ vec_foreach (ns, nses)
+ vec_free (ns->name);
+
+ vec_free (nses);
+
+ vec_foreach (sub, jm->sw_if_subif_table) {
+ vec_free (sub->interface_name);
+ }
+ vec_free (jm->sw_if_subif_table);
+
+ /* recreate the interface name hash table */
+ jm->sw_if_index_by_interface_name
+ = hash_create_string (0, sizeof(uword));
+
+ /* Get list of ethernets */
+ M(SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter-1));
+ S;
+
+ /* and local / loopback interfaces */
+ M(SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter-1));
+ S;
+
+ /* and vxlan tunnel interfaces */
+ M(SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter-1));
+ S;
+
+ /* and tap tunnel interfaces */
+ M(SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "tap", sizeof(mp->name_filter-1));
+ S;
+
+ /* and l2tpv3 tunnel interfaces */
+ M(SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->name_filter_valid = 1;
+ strncpy ((char *) mp->name_filter, "l2tpv3_tunnel",
+ sizeof(mp->name_filter-1));
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
+ W;
+}
+
+JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getVppVersion
+ (JNIEnv *env, jobject obj)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ jmethodID constr;
+ // TODO: cache this
+ jclass cls = (*env)->FindClass(env, "org/openvpp/vppjapi/vppVersion");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ return NULL;
+ }
+
+ constr = (*env)->GetMethodID(env, cls, "<init>", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ return NULL;
+ }
+
+ vppjni_lock (jm, 11);
+ jstring progName = (*env)->NewStringUTF(env, (char *)jm->program_name);
+ jstring buildDir = (*env)->NewStringUTF(env, (char *)jm->build_directory);
+ jstring gitBranch = (*env)->NewStringUTF(env, (char *)jm->git_branch);
+ jstring buildDate = (*env)->NewStringUTF(env, (char *)jm->build_date);
+ vppjni_unlock (jm);
+
+ return (*env)->NewObject(env, cls, constr, progName, buildDir, gitBranch, buildDate);
+}
+
+static int jm_show_version (vppjni_main_t *jm)
+{
+ int rv;
+ vl_api_show_version_t *mp;
+ f64 timeout;
+
+ vppjni_lock (jm, 10);
+ M(SHOW_VERSION, show_version);
+
+ S;
+ vppjni_unlock (jm);
+ WNR;
+ return rv;
+}
+
+static int jm_stats_enable_disable (vppjni_main_t *jm, u8 enable)
+{
+ vl_api_want_stats_t * mp;
+ f64 timeout;
+ int rv;
+
+ vppjni_lock (jm, 13);
+
+ M(WANT_STATS, want_stats);
+
+ mp->enable_disable = enable;
+
+ S;
+ vppjni_unlock (jm);
+ WNR;
+
+ // already subscribed / already disabled (it's ok)
+ if (rv == -2 || rv == -3)
+ rv = 0;
+ return rv;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_clientConnect
+ (JNIEnv *env, jobject obj, jstring clientName)
+{
+ int rv;
+ const char *client_name;
+ void vl_msg_reply_handler_hookup(void);
+ vppjni_main_t * jm = &vppjni_main;
+ api_main_t * am = &api_main;
+ u8 * heap;
+ mheap_t * h;
+ f64 timeout;
+
+ /*
+ * Bail out now if we're not running as root
+ */
+ if (geteuid() != 0)
+ return -1;
+
+ if (jm->is_connected)
+ return -2;
+
+ if (jm->heap == 0)
+ clib_mem_init (0, 128<<20);
+
+ heap = clib_mem_get_per_cpu_heap();
+ h = mheap_header (heap);
+
+ client_name = (*env)->GetStringUTFChars (env, clientName, 0);
+
+ clib_time_init (&jm->clib_time);
+
+ rv = connect_to_vpe ((char *) client_name);
+
+ if (rv < 0)
+ clib_warning ("connection failed, rv %d", rv);
+
+ (*env)->ReleaseStringUTFChars (env, clientName, client_name);
+
+ if (rv == 0)
+ {
+ vl_msg_reply_handler_hookup ();
+ jm->is_connected = 1;
+ /* make the main heap thread-safe */
+ h->flags |= MHEAP_FLAG_THREAD_SAFE;
+
+ jm->reply_hash = hash_create (0, sizeof (uword));
+ jm->callback_hash = hash_create (0, sizeof (uword));
+ jm->ping_hash = hash_create (0, sizeof (uword));
+ jm->api_main = am;
+ vjbd_main_init(&jm->vjbd_main);
+ jm->sw_if_index_by_interface_name =
+ hash_create_string (0, sizeof (uword));
+
+ {
+ // call control ping first to attach rx thread to java thread
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ WNR;
+
+ if (rv != 0) {
+ clib_warning ("first control ping failed: %d", rv);
+ }
+ }
+ rv = jm_show_version(jm);
+ if (rv != 0)
+ clib_warning ("unable to retrieve vpp version (rv: %d)", rv);
+ rv = sw_interface_dump(jm);
+ if (rv != 0)
+ clib_warning ("unable to retrieve interface list (rv: %d)", rv);
+ rv = jm_stats_enable_disable(jm, 1);
+ if (rv != 0)
+ clib_warning ("unable to subscribe to stats (rv: %d)", rv);
+ }
+ clib_warning ("clientConnect result: %d", rv);
+
+ return rv;
+}
+
+JNIEXPORT void JNICALL Java_org_openvpp_vppjapi_vppConn_clientDisconnect
+ (JNIEnv *env, jobject obj)
+{
+ u8 *save_heap;
+ vppjni_main_t * jm = &vppjni_main;
+ vl_client_disconnect_from_vlib();
+
+ save_heap = jm->heap;
+ memset (jm, 0, sizeof (*jm));
+ jm->heap = save_heap;
+}
+
+void vl_api_generic_reply_handler (vl_api_generic_reply_t *mp)
+{
+ api_main_t * am = &api_main;
+ u16 msg_id = clib_net_to_host_u16 (mp->_vl_msg_id);
+ trace_cfg_t *cfgp;
+ i32 retval = clib_net_to_host_u32 (mp->retval);
+ int total_bytes = sizeof(mp);
+ vppjni_main_t * jm = &vppjni_main;
+ u8 * saved_reply = 0;
+ u32 context = clib_host_to_net_u32 (mp->context);
+
+ cfgp = am->api_trace_cfg + msg_id;
+
+ if (!cfgp)
+ clib_warning ("msg id %d: no trace configuration\n", msg_id);
+ else
+ total_bytes = cfgp->size;
+
+ jm->context_id_received = context;
+
+ clib_warning("Received generic reply for msg id %d", msg_id);
+
+ /* A generic reply, successful, we're done */
+ if (retval >= 0 && total_bytes == sizeof(*mp))
+ return;
+
+ /* Save the reply */
+ vec_validate (saved_reply, total_bytes - 1);
+ memcpy (saved_reply, mp, total_bytes);
+
+ vppjni_lock (jm, 2);
+ hash_set (jm->reply_hash, context, saved_reply);
+ jm->saved_reply_count ++;
+ vppjni_unlock (jm);
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_getRetval
+(JNIEnv * env, jobject obj, jint context, jint release)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ vl_api_generic_reply_t * mp;
+ uword * p;
+ int rv = 0;
+
+ /* Dunno yet? */
+ if (context > jm->context_id_received)
+ return (VNET_API_ERROR_RESPONSE_NOT_READY);
+
+ vppjni_lock (jm, 1);
+ p = hash_get (jm->reply_hash, context);
+
+ /*
+ * Two cases: a generic "yes" reply - won't be in the hash table
+ * or "no", or "more data" which will be in the table.
+ */
+ if (p == 0)
+ goto out;
+
+ mp = (vl_api_generic_reply_t *) (p[0]);
+ rv = clib_net_to_host_u32 (mp->retval);
+
+ if (release)
+ {
+ u8 * free_me = (u8 *) mp;
+ vec_free (free_me);
+ hash_unset (jm->reply_hash, context);
+ jm->saved_reply_count --;
+ }
+
+out:
+ vppjni_unlock (jm);
+ return (rv);
+}
+
+JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceList
+ (JNIEnv * env, jobject obj, jstring name_filter)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ jstring rv;
+ hash_pair_t * p;
+ name_sort_t * nses = 0, * ns;
+ const char *this_name;
+ const char * nf = (*env)->GetStringUTFChars (env, name_filter, NULL);
+ u8 * s = 0;
+ char *strcasestr (const char *, const char *);
+
+ vppjni_lock (jm, 4);
+
+ hash_foreach_pair (p, jm->sw_if_index_by_interface_name,
+ ({
+ this_name = (const char *)(p->key);
+ if (strlen (nf) == 0 || strcasestr (this_name, nf))
+ {
+ vec_add2 (nses, ns, 1);
+ ns->name = (u8 *)(p->key);
+ ns->value = (u32) p->value[0];
+ }
+ }));
+
+ vec_sort (nses, n1, n2,
+ strcmp ((char *)n1->name, (char *)n2->name));
+
+ vec_foreach (ns, nses)
+ s = format (s, "%s: %d, ", ns->name, ns->value);
+
+ _vec_len (s) = vec_len (s) - 2;
+ vec_terminate_c_string (s);
+ vppjni_unlock (jm);
+
+ vec_free (nses);
+
+ (*env)->ReleaseStringUTFChars (env, name_filter, nf);
+
+ rv = (*env)->NewStringUTF (env, (char *) s);
+ vec_free (s);
+
+ return rv;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_swIfIndexFromName
+ (JNIEnv * env, jobject obj, jstring interfaceName)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ jint rv = -1;
+ const char * if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL);
+ uword * p;
+
+ vppjni_lock (jm, 5);
+
+ p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name);
+
+ if (p != 0)
+ rv = (jint) p[0];
+
+ vppjni_unlock (jm);
+
+ (*env)->ReleaseStringUTFChars (env, interfaceName, if_name);
+
+ return rv;
+}
+
+JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceCounters
+(JNIEnv * env, jobject obj, jint swIfIndex)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ sw_interface_stats_t *s;
+ u32 sw_if_index = swIfIndex;
+ jmethodID constr;
+ jobject result = NULL;
+
+ // TODO: cache this
+ jclass cls = (*env)->FindClass(env, "org/openvpp/vppjapi/vppInterfaceCounters");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ return NULL;
+ }
+
+ constr = (*env)->GetMethodID(env, cls, "<init>", "(JJJJJJJJJJJJJJJJJJJJJJ)V");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ return NULL;
+ }
+
+ vppjni_lock (jm, 16);
+
+ if (sw_if_index >= vec_len(jm->sw_if_stats_by_sw_if_index)) {
+ goto out;
+ }
+ s = &jm->sw_if_stats_by_sw_if_index[sw_if_index];
+ if (!s->valid) {
+ goto out;
+ }
+
+ result = (*env)->NewObject(env, cls, constr,
+ s->rx.octets, s->rx.pkts.ip4, s->rx.pkts.ip6, s->rx.pkts.unicast,
+ s->rx.pkts.multicast, s->rx.pkts.broadcast, s->rx.pkts.discard,
+ s->rx.pkts.fifo_full, s->rx.pkts.error, s->rx.pkts.unknown_proto,
+ s->rx.pkts.miss,
+ s->tx.octets, s->tx.pkts.ip4, s->tx.pkts.ip6, s->tx.pkts.unicast,
+ s->tx.pkts.multicast, s->tx.pkts.broadcast, s->tx.pkts.discard,
+ s->tx.pkts.fifo_full, s->tx.pkts.error, s->tx.pkts.unknown_proto,
+ s->tx.pkts.miss);
+
+out:
+ vppjni_unlock (jm);
+ return result;
+}
+
+JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_interfaceNameFromSwIfIndex
+(JNIEnv * env, jobject obj, jint swIfIndex)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ sw_interface_details_t *sw_if_details;
+ u32 sw_if_index;
+ jstring ifname = NULL;
+
+ vppjni_lock (jm, 8);
+
+ sw_if_index = swIfIndex;
+
+ if (sw_if_index >= vec_len(jm->sw_if_table)) {
+ goto out;
+ }
+ sw_if_details = &jm->sw_if_table[sw_if_index];
+ if (!sw_if_details->valid) {
+ goto out;
+ }
+
+ u8 * s = format (0, "%s%c", sw_if_details->interface_name, 0);
+ ifname = (*env)->NewStringUTF(env, (char *)s);
+
+out:
+ vppjni_unlock (jm);
+
+ return ifname;
+}
+
+JNIEXPORT void JNICALL Java_org_openvpp_vppjapi_vppConn_clearInterfaceTable
+(JNIEnv * env, jobject obj)
+{
+ vppjni_main_t * jm = &vppjni_main;
+
+ vppjni_lock (jm, 10);
+
+ vec_reset_length(jm->sw_if_table);
+
+ vppjni_unlock (jm);
+}
+
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_swInterfaceDump
+(JNIEnv * env, jobject obj, jbyte name_filter_valid, jbyteArray name_filter)
+{
+ vppjni_main_t *jm = &vppjni_main;
+ f64 timeout;
+ vl_api_sw_interface_dump_t * mp;
+ u32 my_context_id;
+ int rv;
+ rv = vppjni_sanity_check (jm);
+ if (rv) return rv;
+ vppjni_lock (jm, 7);
+ my_context_id = vppjni_get_context_id (jm);
+ jbyte * name_filterP = (*env)->GetByteArrayElements (env, name_filter, NULL);
+ int cnt = (*env)->GetArrayLength (env, name_filter);
+
+ M(SW_INTERFACE_DUMP, sw_interface_dump);
+ mp->context = clib_host_to_net_u32 (my_context_id);
+ mp->name_filter_valid = name_filter_valid;
+
+ if (cnt > sizeof(mp->name_filter))
+ cnt = sizeof(mp->name_filter);
+
+ memcpy ((char *) mp->name_filter, name_filterP, cnt);
+ (*env)->ReleaseByteArrayElements (env, name_filter, name_filterP, 0);
+
+ clib_warning("interface filter (%d, %s, len: %d)", mp->name_filter_valid, (char *)mp->name_filter, cnt);
+
+ hash_set (jm->callback_hash, my_context_id, (*env)->NewGlobalRef(env, obj));
+ jm->collect_indices = 1;
+
+ S;
+ {
+ // now send control ping so we know when it ends
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ mp->context = clib_host_to_net_u32 (my_context_id);
+
+ // this control ping will mark end of interface dump
+ hash_set (jm->ping_hash, my_context_id, VL_API_SW_INTERFACE_DUMP);
+
+ S;
+ }
+ vppjni_unlock (jm);
+ WNR;
+ return my_context_id;
+}
+
+static int sw_if_dump_call_all_callbacks (jobject obj)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ sw_interface_details_t *sw_if_details;
+ int rc = 0;
+ u32 i;
+
+ JNIEnv *env = jm->jenv;
+
+ for (i = 0; i < vec_len(jm->sw_if_dump_if_indices); i++) {
+ u32 sw_if_index = jm->sw_if_dump_if_indices[i];
+ ASSERT(sw_if_index < vec_len(jm->sw_if_table));
+ sw_if_details = &jm->sw_if_table[sw_if_index];
+ ASSERT(sw_if_details->valid);
+
+ u8 * s = format (0, "%s%c", sw_if_details->interface_name, 0);
+
+ jstring ifname = (*env)->NewStringUTF(env, (char *)s);
+ jint ifIndex = sw_if_details->sw_if_index;
+ jint supIfIndex = sw_if_details->sup_sw_if_index;
+ jbyteArray physAddr = (*env)->NewByteArray(env,
+ sw_if_details->l2_address_length);
+ (*env)->SetByteArrayRegion(env, physAddr, 0,
+ sw_if_details->l2_address_length,
+ (signed char*)sw_if_details->l2_address);
+ jint subId = sw_if_details->sub_id;
+ jint subOuterVlanId = sw_if_details->sub_outer_vlan_id;
+ jint subInnerVlanId = sw_if_details->sub_inner_vlan_id;
+ jint vtrOp = sw_if_details->vtr_op;
+ jint vtrPushDot1q = sw_if_details->vtr_push_dot1q;
+ jint vtrTag1 = sw_if_details->vtr_tag1;
+ jint vtrTag2 = sw_if_details->vtr_tag2;
+
+ jmethodID jmtdIfDetails = jm->jmtdIfDetails;
+
+ jbyte adminUpDown = sw_if_details->admin_up_down;
+ jbyte linkUpDown = sw_if_details->link_up_down;
+ jbyte linkDuplex = sw_if_details->link_duplex;
+ jbyte linkSpeed = sw_if_details->link_speed;
+ jbyte subDot1ad = sw_if_details->sub_dot1ad;
+ jbyte subNumberOfTags = sw_if_details->sub_number_of_tags;
+ jbyte subExactMatch = sw_if_details->sub_exact_match;
+ jbyte subDefault = sw_if_details->sub_default;
+ jbyte subOuterVlanIdAny = sw_if_details->sub_outer_vlan_id_any;
+ jbyte subInnerVlanIdAny = sw_if_details->sub_inner_vlan_id_any;
+
+ clib_warning("Method: %p, Calling method", jm->jmtdIfDetails);
+ (*env)->CallVoidMethod(env, obj, jmtdIfDetails, ifIndex, ifname,
+ supIfIndex, physAddr, adminUpDown, linkUpDown,
+ linkDuplex, linkSpeed, subId, subDot1ad,
+ subNumberOfTags, subOuterVlanId, subInnerVlanId,
+ subExactMatch, subDefault, subOuterVlanIdAny,
+ subInnerVlanIdAny, vtrOp, vtrPushDot1q, vtrTag1, vtrTag2);
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rc = 1;
+ goto out;
+ }
+ }
+ clib_warning("Method: %p, Calling method (null arg)", jm->jmtdIfDetails);
+ jmethodID jmtdIfDetails = jm->jmtdIfDetails;
+ (*env)->CallVoidMethod(env, obj, jmtdIfDetails, -1, NULL, -1, NULL, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rc = 1;
+ goto out;
+ }
+
+ clib_warning("Done");
+
+out:
+ jm->collect_indices = 0;
+ vec_reset_length(jm->sw_if_dump_if_indices);
+ return rc;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_findOrAddBridgeDomainId
+ (JNIEnv * env, jobject obj, jstring bridgeDomain)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ jint rv = -1;
+ const char * bd_name = (*env)->GetStringUTFChars (env, bridgeDomain, NULL);
+
+ vppjni_lock (jm, 6);
+
+ rv = (jint)vjbd_find_or_add_bd (&jm->vjbd_main, (u8 *)bd_name);
+
+ vppjni_unlock (jm);
+
+ (*env)->ReleaseStringUTFChars (env, bridgeDomain, bd_name);
+
+ return rv;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainIdFromName
+ (JNIEnv * env, jobject obj, jstring bridgeDomain)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ jint rv = -1;
+ const char * bd_name = (*env)->GetStringUTFChars(env, bridgeDomain, NULL);
+
+ vppjni_lock(jm, 7);
+
+ rv = (jint)vjbd_id_from_name(&jm->vjbd_main, (u8 *)bd_name);
+
+ vppjni_unlock(jm);
+
+ (*env)->ReleaseStringUTFChars(env, bridgeDomain, bd_name);
+
+ return rv;
+}
+
+JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainIdFromInterfaceName
+ (JNIEnv * env, jobject obj, jstring interfaceName)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ vjbd_main_t * bdm = &jm->vjbd_main;
+ u32 sw_if_index;
+ jint rv = -1;
+ const char * if_name;
+ uword * p;
+
+ if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL);
+
+ vppjni_lock (jm, 14);
+
+ p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name);
+
+ if (p != 0) {
+ sw_if_index = (jint) p[0];
+ p = hash_get (bdm->bd_id_by_sw_if_index, sw_if_index);
+ if (p != 0) {
+ rv = (jint) p[0];
+ }
+ }
+
+ vppjni_unlock (jm);
+
+ (*env)->ReleaseStringUTFChars (env, interfaceName, if_name);
+
+ return rv;
+}
+
+/*
+ * Special-case: build the interface table, maintain
+ * the next loopback sw_if_index vbl.
+ */
+static void vl_api_sw_interface_details_t_handler
+(vl_api_sw_interface_details_t * mp)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ static sw_interface_details_t empty_sw_if_details = {0,};
+ sw_interface_details_t *sw_if_details;
+ u32 sw_if_index;
+
+ vppjni_lock (jm, 1);
+
+ sw_if_index = ntohl (mp->sw_if_index);
+
+ u8 * s = format (0, "%s%c", mp->interface_name, 0);
+
+ if (jm->collect_indices) {
+ u32 pos = vec_len(jm->sw_if_dump_if_indices);
+ vec_validate(jm->sw_if_dump_if_indices, pos);
+ jm->sw_if_dump_if_indices[pos] = sw_if_index;
+ }
+
+ vec_validate_init_empty(jm->sw_if_table, sw_if_index, empty_sw_if_details);
+ sw_if_details = &jm->sw_if_table[sw_if_index];
+ sw_if_details->valid = 1;
+
+ snprintf((char *)sw_if_details->interface_name,
+ sizeof(sw_if_details->interface_name), "%s", (char *)s);
+ sw_if_details->sw_if_index = sw_if_index;
+ sw_if_details->sup_sw_if_index = ntohl(mp->sup_sw_if_index);
+ sw_if_details->l2_address_length = ntohl (mp->l2_address_length);
+ ASSERT(sw_if_details->l2_address_length <= sizeof(sw_if_details->l2_address));
+ memcpy(sw_if_details->l2_address, mp->l2_address,
+ sw_if_details->l2_address_length);
+ sw_if_details->sub_id = ntohl (mp->sub_id);
+ sw_if_details->sub_outer_vlan_id = ntohl (mp->sub_outer_vlan_id);
+ sw_if_details->sub_inner_vlan_id = ntohl (mp->sub_inner_vlan_id);
+ sw_if_details->vtr_op = ntohl (mp->vtr_op);
+ sw_if_details->vtr_push_dot1q = ntohl (mp->vtr_push_dot1q);
+ sw_if_details->vtr_tag1 = ntohl (mp->vtr_tag1);
+ sw_if_details->vtr_tag2 = ntohl (mp->vtr_tag2);
+
+ sw_if_details->admin_up_down = mp->admin_up_down;
+ sw_if_details->link_up_down = mp->link_up_down;
+ sw_if_details->link_duplex = mp->link_duplex;
+ sw_if_details->link_speed = mp->link_speed;
+ sw_if_details->sub_dot1ad = mp->sub_dot1ad;
+ sw_if_details->sub_number_of_tags = mp->sub_number_of_tags;
+ sw_if_details->sub_exact_match = mp->sub_exact_match;
+ sw_if_details->sub_default = mp->sub_default;
+ sw_if_details->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
+ sw_if_details->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
+
+ hash_set_mem (jm->sw_if_index_by_interface_name, s, sw_if_index);
+ clib_warning("Got interface %s", (char *)s);
+
+ /* In sub interface case, fill the sub interface table entry */
+ if (mp->sw_if_index != mp->sup_sw_if_index) {
+ sw_interface_subif_t * sub = NULL;
+
+ vec_add2(jm->sw_if_subif_table, sub, 1);
+
+ vec_validate(sub->interface_name, strlen((char *)s) + 1);
+ strncpy((char *)sub->interface_name, (char *)s,
+ vec_len(sub->interface_name));
+ sub->sw_if_index = ntohl(mp->sw_if_index);
+ sub->sub_id = ntohl(mp->sub_id);
+
+ sub->sub_dot1ad = mp->sub_dot1ad;
+ sub->sub_number_of_tags = mp->sub_number_of_tags;
+ sub->sub_outer_vlan_id = ntohs(mp->sub_outer_vlan_id);
+ sub->sub_inner_vlan_id = ntohs(mp->sub_inner_vlan_id);
+ sub->sub_exact_match = mp->sub_exact_match;
+ sub->sub_default = mp->sub_default;
+ sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any;
+ sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any;
+
+ /* vlan tag rewrite */
+ sub->vtr_op = ntohl(mp->vtr_op);
+ sub->vtr_push_dot1q = ntohl(mp->vtr_push_dot1q);
+ sub->vtr_tag1 = ntohl(mp->vtr_tag1);
+ sub->vtr_tag2 = ntohl(mp->vtr_tag2);
+ }
+ vppjni_unlock (jm);
+}
+
+static void vl_api_sw_interface_set_flags_t_handler
+(vl_api_sw_interface_set_flags_t * mp)
+{
+ /* $$$ nothing for the moment */
+}
+
+static jintArray create_array_of_bd_ids(JNIEnv * env, jint bd_id)
+{
+ vppjni_main_t *jm = &vppjni_main;
+ vjbd_main_t * bdm = &jm->vjbd_main;
+ u32 *buf = NULL;
+ u32 i;
+
+ if (bd_id != ~0) {
+ vec_add1(buf, bd_id);
+ } else {
+ for (i = 0; i < vec_len(bdm->bd_oper); i++) {
+ u32 bd_id = bdm->bd_oper[i].bd_id;
+ vec_add1(buf, bd_id);
+ }
+ }
+
+ jintArray bdidArray = (*env)->NewIntArray(env, vec_len(buf));
+
+ (*env)->SetIntArrayRegion(env, bdidArray, 0, vec_len(buf), (int*)buf);
+
+ return bdidArray;
+}
+
+static void bridge_domain_oper_free(void)
+{
+ vppjni_main_t *jm = &vppjni_main;
+ vjbd_main_t *bdm = &jm->vjbd_main;
+ u32 i;
+
+ for (i = 0; i < vec_len(bdm->bd_oper); i++) {
+ vec_free(bdm->bd_oper->l2fib_oper);
+ }
+ vec_reset_length(bdm->bd_oper);
+ hash_free(bdm->bd_id_by_sw_if_index);
+ hash_free(bdm->oper_bd_index_by_bd_id);
+}
+
+JNIEXPORT jintArray JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainDump
+(JNIEnv * env, jobject obj, jint bd_id)
+{
+ vppjni_main_t *jm = &vppjni_main;
+ vl_api_bridge_domain_dump_t * mp;
+ u32 my_context_id;
+ f64 timeout;
+ int rv;
+ rv = vppjni_sanity_check (jm);
+ if (rv) return NULL;
+
+ vppjni_lock (jm, 15);
+
+ if (~0 == bd_id) {
+ bridge_domain_oper_free();
+ }
+
+ my_context_id = vppjni_get_context_id (jm);
+ M(BRIDGE_DOMAIN_DUMP, bridge_domain_dump);
+ mp->context = clib_host_to_net_u32 (my_context_id);
+ mp->bd_id = clib_host_to_net_u32(bd_id);
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
+
+ WNR;
+ if (0 != rv) {
+ return NULL;
+ }
+
+ jintArray ret = create_array_of_bd_ids(env, bd_id);
+
+ vppjni_unlock (jm);
+
+ return ret;
+}
+
+static void
+vl_api_bridge_domain_details_t_handler (vl_api_bridge_domain_details_t * mp)
+{
+ vppjni_main_t *jm = &vppjni_main;
+ vjbd_main_t * bdm = &jm->vjbd_main;
+ vjbd_oper_t * bd_oper;
+ u32 bd_id, bd_index;
+
+ bd_id = ntohl (mp->bd_id);
+
+ bd_index = vec_len(bdm->bd_oper);
+ vec_validate (bdm->bd_oper, bd_index);
+ bd_oper = vec_elt_at_index(bdm->bd_oper, bd_index);
+
+ hash_set(bdm->oper_bd_index_by_bd_id, bd_id, bd_index);
+
+ bd_oper->bd_id = bd_id;
+ bd_oper->flood = mp->flood != 0;
+ bd_oper->forward = mp->forward != 0;
+ bd_oper->learn = mp->learn != 0;
+ bd_oper->uu_flood = mp->flood != 0;
+ bd_oper->arp_term = mp->arp_term != 0;
+ bd_oper->bvi_sw_if_index = ntohl (mp->bvi_sw_if_index);
+ bd_oper->n_sw_ifs = ntohl (mp->n_sw_ifs);
+
+ bd_oper->bd_sw_if_oper = 0;
+}
+
+static void
+vl_api_bridge_domain_sw_if_details_t_handler
+(vl_api_bridge_domain_sw_if_details_t * mp)
+{
+ vppjni_main_t *jm = &vppjni_main;
+ vjbd_main_t * bdm = &jm->vjbd_main;
+ bd_sw_if_oper_t * bd_sw_if_oper;
+ u32 bd_id, sw_if_index;
+
+ bd_id = ntohl (mp->bd_id);
+ sw_if_index = ntohl (mp->sw_if_index);
+
+ uword *p;
+ p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
+ if (p == 0) {
+ clib_warning("Invalid bd_id %d in bridge_domain_sw_if_details_t_handler", bd_id);
+ return;
+ }
+ u32 oper_bd_index = (jint) p[0];
+ vjbd_oper_t *bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
+
+ u32 len = vec_len(bd_oper->bd_sw_if_oper);
+ vec_validate(bd_oper->bd_sw_if_oper, len);
+ bd_sw_if_oper = &bd_oper->bd_sw_if_oper[len];
+ bd_sw_if_oper->bd_id = bd_id;
+ bd_sw_if_oper->sw_if_index = sw_if_index;
+ bd_sw_if_oper->shg = mp->shg;
+
+ hash_set(bdm->bd_id_by_sw_if_index, sw_if_index, bd_id);
+}
+
+static const char* interface_name_from_sw_if_index(u32 sw_if_index)
+{
+ vppjni_main_t *jm = &vppjni_main;
+
+ if (sw_if_index >= vec_len(jm->sw_if_table)) {
+ return NULL;
+ }
+ if (!jm->sw_if_table[sw_if_index].valid) {
+ return NULL;
+ }
+ return (const char*)jm->sw_if_table[sw_if_index].interface_name;
+}
+
+JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getBridgeDomainDetails
+(JNIEnv * env, jobject obj, jint bdId)
+{
+ vppjni_main_t *jm = &vppjni_main;
+ vjbd_main_t * bdm = &jm->vjbd_main;
+ u32 oper_bd_index;
+ u32 bd_id = bdId;
+ jobject rv = NULL;
+ uword *p;
+
+ vppjni_lock (jm, 16);
+
+ p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
+ if (p == 0) {
+ rv = NULL;
+ goto out;
+ }
+ oper_bd_index = (jint) p[0];
+
+ vjbd_oper_t *bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
+
+
+ /* setting BridgeDomainDetails */
+
+ jclass bddClass = (*env)->FindClass(env, "org/openvpp/vppjapi/vppBridgeDomainDetails");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+
+ jmethodID midInit = (*env)->GetMethodID(env, bddClass, "<init>", "()V");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ jobject bddObj = (*env)->NewObject(env, bddClass, midInit);
+
+ u8 *vec_bd_name = vjbd_oper_name_from_id(bdm, bd_id);
+ if (NULL == vec_bd_name) {
+ rv = NULL;
+ goto out;
+ }
+ char *str_bd_name = (char*)format (0, "%s%c", vec_bd_name, 0);
+ vec_free(vec_bd_name);
+ jstring bdName = (*env)->NewStringUTF(env, str_bd_name);
+ vec_free(str_bd_name);
+ if (NULL == bdName) {
+ rv = NULL;
+ goto out;
+ }
+ jfieldID fidName = (*env)->GetFieldID(env, bddClass, "name", "Ljava/lang/String;");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetObjectField(env, bddObj, fidName, bdName);
+
+ jfieldID fidBdId = (*env)->GetFieldID(env, bddClass, "bdId", "I");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetIntField(env, bddObj, fidBdId, bdId);
+
+ jboolean flood = bd_oper->flood;
+ jfieldID fidFlood = (*env)->GetFieldID(env, bddClass, "flood", "Z");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetBooleanField(env, bddObj, fidFlood, flood);
+
+ jboolean uuFlood = bd_oper->uu_flood;
+ jfieldID fidUuFlood = (*env)->GetFieldID(env, bddClass, "uuFlood", "Z");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetBooleanField(env, bddObj, fidUuFlood, uuFlood);
+
+ jboolean forward = bd_oper->forward;
+ jfieldID fidForward = (*env)->GetFieldID(env, bddClass, "forward", "Z");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetBooleanField(env, bddObj, fidForward, forward);
+
+ jboolean learn = bd_oper->learn;
+ jfieldID fidLearn = (*env)->GetFieldID(env, bddClass, "learn", "Z");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetBooleanField(env, bddObj, fidLearn, learn);
+
+ jboolean arpTerm = bd_oper->arp_term;
+ jfieldID fidArpTerm = (*env)->GetFieldID(env, bddClass, "arpTerm", "Z");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetBooleanField(env, bddObj, fidArpTerm, arpTerm);
+
+ jstring bviInterfaceName = NULL;
+ if (~0 != bd_oper->bvi_sw_if_index) {
+ const char *str_if_name = interface_name_from_sw_if_index(bd_oper->bvi_sw_if_index);
+ if (NULL == str_if_name) {
+ clib_warning("Could not get interface name for sw_if_index %d", bd_oper->bvi_sw_if_index);
+ rv = NULL;
+ goto out;
+ }
+ bviInterfaceName = (*env)->NewStringUTF(env, str_if_name);
+ if (NULL == bviInterfaceName) {
+ rv = NULL;
+ goto out;
+ }
+ }
+ jfieldID fidBviInterfaceName = (*env)->GetFieldID(env, bddClass, "bviInterfaceName", "Ljava/lang/String;");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetObjectField(env, bddObj, fidBviInterfaceName, bviInterfaceName);
+
+
+ /* setting BridgeDomainInterfaceDetails */
+
+ jclass bdidClass = (*env)->FindClass(env, "org/openvpp/vppjapi/vppBridgeDomainInterfaceDetails");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+
+ jfieldID fidInterfaceName = (*env)->GetFieldID(env, bdidClass, "interfaceName", "Ljava/lang/String;");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+
+ jfieldID fidSHG = (*env)->GetFieldID(env, bdidClass, "splitHorizonGroup", "B");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+
+ u32 len = vec_len(bd_oper->bd_sw_if_oper);
+ ASSERT(len == bd_oper->n_sw_ifs);
+
+ jobjectArray bdidArray = (*env)->NewObjectArray(env, len, bdidClass, NULL);
+
+ u32 i;
+ for (i = 0; i < len; i++) {
+ bd_sw_if_oper_t *sw_if_oper = &bd_oper->bd_sw_if_oper[i];
+
+ jmethodID midBdidInit = (*env)->GetMethodID(env, bdidClass, "<init>", "()V");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ jobject bdidObj = (*env)->NewObject(env, bdidClass, midBdidInit);
+ (*env)->SetObjectArrayElement(env, bdidArray, i, bdidObj);
+
+ u32 sw_if_index = sw_if_oper->sw_if_index;
+ const char *str_if_name = interface_name_from_sw_if_index(sw_if_index);
+ if (NULL == str_if_name) {
+ rv = NULL;
+ goto out;
+ }
+ jstring interfaceName = (*env)->NewStringUTF(env, str_if_name);
+ if (NULL == interfaceName) {
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetObjectField(env, bdidObj, fidInterfaceName, interfaceName);
+
+ jbyte shg = sw_if_oper->shg;
+ (*env)->SetByteField(env, bdidObj, fidSHG, shg);
+ }
+
+ jfieldID fidInterfaces = (*env)->GetFieldID(env, bddClass, "interfaces",
+ "[Lorg/openvpp/vppjapi/vppBridgeDomainInterfaceDetails;");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ rv = NULL;
+ goto out;
+ }
+ (*env)->SetObjectField(env, bddObj, fidInterfaces, bdidArray);
+
+ rv = bddObj;
+
+out:
+
+ vppjni_unlock (jm);
+
+ return rv;
+}
+
+static jobject l2_fib_create_object(JNIEnv *env, bd_l2fib_oper_t *l2_fib)
+{
+ jclass l2FibClass = (*env)->FindClass(env, "org/openvpp/vppjapi/vppL2Fib");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ return NULL;
+ }
+
+ jmethodID midL2FIbInit = (*env)->GetMethodID(env, l2FibClass, "<init>", "([BZLjava/lang/String;ZZ)V");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ return NULL;
+ }
+
+ u32 sw_if_index = l2_fib->sw_if_index;
+ const char *str_if_name = interface_name_from_sw_if_index(sw_if_index);
+ if (NULL == str_if_name) {
+ return NULL;
+ }
+ jstring interfaceName = (*env)->NewStringUTF(env, str_if_name);
+ if (NULL == interfaceName) {
+ return NULL;
+ }
+
+ jbyteArray physAddr = (*env)->NewByteArray(env, 6);
+ (*env)->SetByteArrayRegion(env, physAddr, 0, 6,
+ (signed char*)l2_fib->mac_addr.fields.mac);
+ jboolean staticConfig = !l2_fib->learned;
+ jstring outgoingInterface = interfaceName;
+ jboolean filter = l2_fib->filter;
+ jboolean bridgedVirtualInterface = l2_fib->bvi;
+
+ jobject l2FibObj = (*env)->NewObject(env, l2FibClass, midL2FIbInit,
+ physAddr, staticConfig, outgoingInterface, filter,
+ bridgedVirtualInterface);
+
+ return l2FibObj;
+}
+
+JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_l2FibTableDump
+(JNIEnv * env, jobject obj, jint bd_id)
+{
+ vppjni_main_t *jm = &vppjni_main;
+ vjbd_main_t * bdm = &jm->vjbd_main;
+ vl_api_l2_fib_table_dump_t *mp;
+ jobjectArray l2FibArray = NULL;
+ vjbd_oper_t *bd_oper;
+ u32 oper_bd_index;
+ uword *p;
+ f64 timeout;
+ int rv;
+ u32 i;
+
+ vppjni_lock (jm, 17);
+
+ //vjbd_l2fib_oper_reset (bdm);
+
+ p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
+ if (p == 0) {
+ goto done;
+ }
+ oper_bd_index = p[0];
+ bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
+ vec_reset_length (bd_oper->l2fib_oper);
+
+ /* Get list of l2 fib table entries */
+ M(L2_FIB_TABLE_DUMP, l2_fib_table_dump);
+ mp->bd_id = ntohl(bd_id);
+ S;
+
+ /* Use a control ping for synchronization */
+ {
+ vl_api_control_ping_t * mp;
+ M(CONTROL_PING, control_ping);
+ S;
+ }
+
+ WNR;
+ if (0 != rv) {
+ goto done;
+ }
+
+ u32 count = vec_len(bd_oper->l2fib_oper);
+ bd_l2fib_oper_t *l2fib_oper = bd_oper->l2fib_oper;
+
+ jclass l2FibClass = (*env)->FindClass(env, "org/openvpp/vppjapi/vppL2Fib");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ goto done;
+ }
+
+ l2FibArray = (*env)->NewObjectArray(env, count, l2FibClass, NULL);
+
+ u32 pos = 0;
+ for (i = 0; i < count; i++) {
+ bd_l2fib_oper_t *l2_fib = &l2fib_oper[i];
+ if (1) {
+ jobject l2FibObj = l2_fib_create_object(env, l2_fib);
+ (*env)->SetObjectArrayElement(env, l2FibArray, pos, l2FibObj);
+ pos++;
+ }
+ }
+
+done:
+ vppjni_unlock (jm);
+
+ return l2FibArray;
+}
+
+static void
+vl_api_l2_fib_table_entry_t_handler (vl_api_l2_fib_table_entry_t * mp)
+{
+ //static u8 * mac_addr;
+ vppjni_main_t *jm = &vppjni_main;
+ vjbd_main_t * bdm = &jm->vjbd_main;
+ vjbd_oper_t * bd_oper;
+ u32 bd_id, oper_bd_index;
+ //uword mhash_val_l2fi;
+ bd_l2fib_oper_t * l2fib_oper;
+ l2fib_u64_mac_t * l2fe_u64_mac = (l2fib_u64_mac_t *)&mp->mac;
+
+ bd_id = ntohl (mp->bd_id);
+
+ uword *p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id);
+ if (p == 0) {
+ return;
+ }
+ oper_bd_index = (jint) p[0];
+ bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index);
+
+#if 0
+ vec_validate (mac_addr, MAC_ADDRESS_SIZE);
+ memcpy (mac_addr, l2fe_u64_mac->fields.mac, MAC_ADDRESS_SIZE);
+ mhash_val_l2fi = vec_len (bd_oper->l2fib_oper);
+ if (mhash_elts (&bd_oper->l2fib_index_by_mac) == 0)
+ mhash_init (&bd_oper->l2fib_index_by_mac, sizeof (u32), MAC_ADDRESS_SIZE);
+ mhash_set_mem (&bd_oper->l2fib_index_by_mac, mac_addr, &mhash_val_l2fi, 0);
+#endif
+
+ vec_add2 (bd_oper->l2fib_oper, l2fib_oper, 1);
+
+ l2fib_oper->bd_id = bd_id;
+ l2fib_oper->mac_addr.raw = l2fib_mac_to_u64 (l2fe_u64_mac->fields.mac);
+ l2fib_oper->sw_if_index = ntohl (mp->sw_if_index);
+ l2fib_oper->learned = !mp->static_mac;
+ l2fib_oper->filter = mp->filter_mac;
+ l2fib_oper->bvi = mp->bvi_mac;
+}
+
+/* cleanup handler for RX thread */
+void cleanup_rx_thread(void *arg)
+{
+ vppjni_main_t * jm = &vppjni_main;
+
+ vppjni_lock (jm, 99);
+
+ int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **)&(jm->jenv), JNI_VERSION_1_6);
+ if (getEnvStat == JNI_EVERSION) {
+ clib_warning ("Unsupported JNI version\n");
+ jm->retval = -999;
+ goto out;
+ } else if (getEnvStat != JNI_EDETACHED) {
+ (*jm->jvm)->DetachCurrentThread(jm->jvm);
+ }
+out:
+ vppjni_unlock (jm);
+}
+
+static void
+vl_api_show_version_reply_t_handler (vl_api_show_version_reply_t * mp)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ i32 retval = ntohl(mp->retval);
+
+ if (retval >= 0) {
+ clib_warning ("show version request succeeded(%d)");
+ strncpy((char*)jm->program_name, (const char*)mp->program,
+ sizeof(jm->program_name)-1);
+ jm->program_name[sizeof(jm->program_name)-1] = 0;
+
+ strncpy((char*)jm->build_directory, (const char*)mp->build_directory,
+ sizeof(jm->build_directory)-1);
+ jm->build_directory[sizeof(jm->build_directory)-1] = 0;
+
+ strncpy((char*)jm->git_branch, (const char*)mp->git_branch,
+ sizeof(jm->git_branch)-1);
+ jm->git_branch[sizeof(jm->git_branch)-1] = 0;
+
+ strncpy((char*)jm->build_date, (const char*)mp->build_date,
+ sizeof(jm->build_date)-1);
+ jm->build_date[sizeof(jm->build_date)-1] = 0;
+ } else {
+ clib_error ("show version request failed(%d)", retval);
+ }
+ jm->retval = retval;
+ jm->result_ready = 1;
+}
+
+static void vl_api_want_stats_reply_t_handler (vl_api_want_stats_reply_t * mp)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ jm->retval = mp->retval; // FIXME: vpp api does not do ntohl on this retval
+ jm->result_ready = 1;
+}
+
+// control ping needs to be very first thing called
+// to attach rx thread to java thread
+static void vl_api_control_ping_reply_t_handler
+(vl_api_control_ping_reply_t * mp)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ i32 retval = ntohl(mp->retval);
+ u32 context = clib_host_to_net_u32 (mp->context);
+ uword *p = NULL;
+
+ jm->retval = retval;
+
+ // attach to java thread if not attached
+ int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **)&(jm->jenv), JNI_VERSION_1_6);
+ if (getEnvStat == JNI_EDETACHED) {
+ if ((*jm->jvm)->AttachCurrentThread(jm->jvm, (void **)&(jm->jenv), NULL) != 0) {
+ clib_warning("Failed to attach thread\n");
+ jm->retval = -999;
+ goto out;
+ }
+
+ // workaround as we can't use pthread_cleanup_push
+ pthread_key_create(&jm->cleanup_rx_thread_key, cleanup_rx_thread);
+ // destructor is only called if the value of key is non null
+ pthread_setspecific(jm->cleanup_rx_thread_key, (void *)1);
+ } else if (getEnvStat == JNI_EVERSION) {
+ clib_warning ("Unsupported JNI version\n");
+ jm->retval = -999;
+ goto out;
+ }
+ // jm->jenv is now stable global reference that can be reused
+
+ // get issuer msg-id
+ p = hash_get (jm->ping_hash, context);
+ if (p != 0) { // ping marks end of some dump call
+ JNIEnv *env = jm->jenv;
+ u16 msg_id = (u16)p[0];
+
+ // we will no longer need this
+ hash_unset (jm->ping_hash, context);
+
+ // get original caller obj
+ p = hash_get (jm->callback_hash, context);
+
+ if (p == 0) // don't have callback stored
+ goto out;
+
+ jobject obj = (jobject)p[0]; // object that called original call
+
+ switch (msg_id) {
+ case VL_API_SW_INTERFACE_DUMP:
+ if (0 != sw_if_dump_call_all_callbacks(obj)) {
+ goto out2;
+ }
+ break;
+ default:
+ clib_warning("Unhandled control ping issuer msg-id: %d", msg_id);
+ goto out2;
+ break;
+ }
+ out2:
+ // free the saved obj
+ hash_unset (jm->callback_hash, context);
+ // delete global reference
+ (*env)->DeleteGlobalRef(env, obj);
+ }
+out:
+ jm->result_ready = 1;
+}
+
+#define VPPJNI_DEBUG_COUNTERS 0
+
+static void vl_api_vnet_interface_counters_t_handler
+(vl_api_vnet_interface_counters_t *mp)
+{
+ vppjni_main_t *jm = &vppjni_main;
+ CLIB_UNUSED(char *counter_name);
+ u32 count, sw_if_index;
+ int i;
+ static sw_interface_stats_t empty_stats = {0, };
+
+ vppjni_lock (jm, 12);
+ count = ntohl (mp->count);
+ sw_if_index = ntohl (mp->first_sw_if_index);
+ if (mp->is_combined == 0) {
+ u64 * vp, v;
+ vp = (u64 *) mp->data;
+
+ for (i = 0; i < count; i++) {
+ sw_interface_details_t *sw_if = NULL;
+
+ v = clib_mem_unaligned (vp, u64);
+ v = clib_net_to_host_u64 (v);
+ vp++;
+
+ if (sw_if_index < vec_len(jm->sw_if_table))
+ sw_if = vec_elt_at_index(jm->sw_if_table, sw_if_index);
+
+ if (sw_if /* && (sw_if->admin_up_down == 1)*/ && sw_if->interface_name[0] != 0)
+ {
+ vec_validate_init_empty(jm->sw_if_stats_by_sw_if_index, sw_if_index, empty_stats);
+ sw_interface_stats_t * s = vec_elt_at_index(jm->sw_if_stats_by_sw_if_index, sw_if_index);
+
+ s->sw_if_index = sw_if_index;
+ s->valid = 1;
+
+ switch (mp->vnet_counter_type) {
+ case VNET_INTERFACE_COUNTER_DROP:
+ counter_name = "drop";
+ s->rx.pkts.discard = v;
+ break;
+ case VNET_INTERFACE_COUNTER_PUNT:
+ counter_name = "punt";
+ s->rx.pkts.unknown_proto = v;
+ break;
+ case VNET_INTERFACE_COUNTER_IP4:
+ counter_name = "ip4";
+ s->rx.pkts.ip4 = v;
+ break;
+ case VNET_INTERFACE_COUNTER_IP6:
+ counter_name = "ip6";
+ s->rx.pkts.ip6 = v;
+ break;
+ case VNET_INTERFACE_COUNTER_RX_NO_BUF:
+ counter_name = "rx-no-buf";
+ s->rx.pkts.fifo_full = v;
+ break;
+ case VNET_INTERFACE_COUNTER_RX_MISS:
+ counter_name = "rx-miss";
+ s->rx.pkts.miss = v;
+ break;
+ case VNET_INTERFACE_COUNTER_RX_ERROR:
+ counter_name = "rx-error";
+ s->rx.pkts.error = v;
+ break;
+ case VNET_INTERFACE_COUNTER_TX_ERROR:
+ counter_name = "tx-error (fifo-full)";
+ s->tx.pkts.fifo_full = v;
+ break;
+ default:
+ counter_name = "bogus";
+ break;
+ }
+
+#if VPPJNI_DEBUG_COUNTERS == 1
+ clib_warning ("%s (%d): %s (%lld)\n", sw_if->interface_name, s->sw_if_index,
+ counter_name, v);
+#endif
+ }
+ sw_if_index++;
+ }
+ } else {
+ vlib_counter_t *vp;
+ u64 packets, bytes;
+ vp = (vlib_counter_t *) mp->data;
+
+ for (i = 0; i < count; i++) {
+ sw_interface_details_t *sw_if = NULL;
+
+ packets = clib_mem_unaligned (&vp->packets, u64);
+ packets = clib_net_to_host_u64 (packets);
+ bytes = clib_mem_unaligned (&vp->bytes, u64);
+ bytes = clib_net_to_host_u64 (bytes);
+ vp++;
+
+ if (sw_if_index < vec_len(jm->sw_if_table))
+ sw_if = vec_elt_at_index(jm->sw_if_table, sw_if_index);
+
+ if (sw_if /* && (sw_if->admin_up_down == 1) */ && sw_if->interface_name[0] != 0)
+ {
+ vec_validate_init_empty(jm->sw_if_stats_by_sw_if_index, sw_if_index, empty_stats);
+ sw_interface_stats_t * s = vec_elt_at_index(jm->sw_if_stats_by_sw_if_index, sw_if_index);
+
+ s->valid = 1;
+ s->sw_if_index = sw_if_index;
+
+ switch (mp->vnet_counter_type) {
+ case VNET_INTERFACE_COUNTER_RX:
+ s->rx.pkts.unicast = packets;
+ s->rx.octets = bytes;
+ counter_name = "rx";
+ break;
+
+ case VNET_INTERFACE_COUNTER_TX:
+ s->tx.pkts.unicast = packets;
+ s->tx.octets = bytes;
+ counter_name = "tx";
+ break;
+
+ default:
+ counter_name = "bogus";
+ break;
+ }
+
+#if VPPJNI_DEBUG_COUNTERS == 1
+ clib_warning ("%s (%d): %s.packets %lld\n",
+ sw_if->interface_name,
+ sw_if_index, counter_name, packets);
+ clib_warning ("%s (%d): %s.bytes %lld\n",
+ sw_if->interface_name,
+ sw_if_index, counter_name, bytes);
+#endif
+ }
+ sw_if_index++;
+ }
+ }
+ vppjni_unlock (jm);
+}
+
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+ vppjni_main_t * jm = &vppjni_main;
+ JNIEnv* env;
+ if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) {
+ return JNI_ERR;
+ }
+
+ jclass cls = (*env)->FindClass(env, "org/openvpp/vppjapi/vppApiCallbacks");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ return JNI_ERR;
+ }
+
+ jm->jmtdIfDetails =
+ (*env)->GetMethodID(env, cls, "interfaceDetails", "(ILjava/lang/String;I[BBBBBIBBIIBBBBIIII)V");
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionDescribe(env);
+ return JNI_ERR;
+ }
+
+ // methods are not local references they stay forever
+ // jclass is local reference let's hold global ref to it
+ jm->jcls = (*env)->NewGlobalRef(env, cls);
+
+ jm->jvm = vm;
+ return JNI_VERSION_1_6;
+}
+
+void JNI_OnUnload(JavaVM *vm, void *reserved) {
+ vppjni_main_t * jm = &vppjni_main;
+ JNIEnv* env;
+ if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) {
+ return;
+ }
+
+ if (jm->jcls != NULL) {
+ (*env)->DeleteGlobalRef(env, jm->jcls);
+ jm->jcls = NULL;
+ }
+
+ jm->jenv = NULL;
+ jm->jvm = NULL;
+}
+
+#define foreach_vpe_api_msg \
+_(CONTROL_PING_REPLY, control_ping_reply) \
+_(SW_INTERFACE_DETAILS, sw_interface_details) \
+_(SHOW_VERSION_REPLY, show_version_reply) \
+_(WANT_STATS_REPLY, want_stats_reply) \
+_(VNET_INTERFACE_COUNTERS, vnet_interface_counters) \
+_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \
+_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details) \
+_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details) \
+_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)
+
+static int connect_to_vpe(char *name)
+{
+ vppjni_main_t * jm = &vppjni_main;
+ api_main_t * am = &api_main;
+
+ if (vl_client_connect_to_vlib("/vpe-api", name, 32) < 0)
+ return -1;
+
+ jm->my_client_index = am->my_client_index;
+ jm->vl_input_queue = am->shmem_hdr->vl_input_queue;
+
+#define _(N,n) \
+ vl_msg_api_set_handlers(VL_API_##N, #n, \
+ vl_api_##n##_t_handler, \
+ vl_noop_handler, \
+ vl_api_##n##_t_endian, \
+ vl_api_##n##_t_print, \
+ sizeof(vl_api_##n##_t), 1);
+ foreach_vpe_api_msg;
+#undef _
+
+
+ return 0;
+}
+
+/* Format an IP6 address. */
+u8 * format_ip6_address (u8 * s, va_list * args)
+{
+ ip6_address_t * a = va_arg (*args, ip6_address_t *);
+ u32 max_zero_run = 0, this_zero_run = 0;
+ int max_zero_run_index = -1, this_zero_run_index=0;
+ int in_zero_run = 0, i;
+ int last_double_colon = 0;
+
+ /* Ugh, this is a pain. Scan forward looking for runs of 0's */
+ for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+ {
+ if (a->as_u16[i] == 0)
+ {
+ if (in_zero_run)
+ this_zero_run++;
+ else
+ {
+ in_zero_run = 1;
+ this_zero_run =1;
+ this_zero_run_index = i;
+ }
+ }
+ else
+ {
+ if (in_zero_run)
+ {
+ /* offer to compress the biggest run of > 1 zero */
+ if (this_zero_run > max_zero_run && this_zero_run > 1)
+ {
+ max_zero_run_index = this_zero_run_index;
+ max_zero_run = this_zero_run;
+ }
+ }
+ in_zero_run = 0;
+ this_zero_run = 0;
+ }
+ }
+
+ if (in_zero_run)
+ {
+ if (this_zero_run > max_zero_run && this_zero_run > 1)
+ {
+ max_zero_run_index = this_zero_run_index;
+ max_zero_run = this_zero_run;
+ }
+ }
+
+ for (i = 0; i < ARRAY_LEN (a->as_u16); i++)
+ {
+ if (i == max_zero_run_index)
+ {
+ s = format (s, "::");
+ i += max_zero_run - 1;
+ last_double_colon = 1;
+ }
+ else
+ {
+ s = format (s, "%s%x",
+ (last_double_colon || i == 0) ? "" : ":",
+ clib_net_to_host_u16 (a->as_u16[i]));
+ last_double_colon = 0;
+ }
+ }
+
+ return s;
+}
+
+/* Format an IP4 address. */
+u8 * format_ip4_address (u8 * s, va_list * args)
+{
+ u8 * a = va_arg (*args, u8 *);
+ return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
+}
+
+
diff --git a/vpp-japi/japi/vppjni.h b/vpp-japi/japi/vppjni.h
new file mode 100644
index 00000000000..d2054b77a26
--- /dev/null
+++ b/vpp-japi/japi/vppjni.h
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef __included_vppjni_h__
+#define __included_vppjni_h__
+
+#include <vnet/vnet.h>
+#include <vnet/ip/ip.h>
+#include <vnet/api_errno.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
+#include <jni.h>
+#include <japi/vppjni_bridge_domain.h>
+
+typedef struct {
+ u8 * name;
+ u32 value;
+} name_sort_t;
+
+typedef struct {
+ u8 valid; // used in a vector of sw_interface_details_t
+
+ u8 interface_name[64];
+ u32 sw_if_index;
+ u32 sup_sw_if_index;
+ u32 l2_address_length;
+ u8 l2_address[8];
+ u8 admin_up_down;
+ u8 link_up_down;
+ u8 link_duplex;
+ u8 link_speed;
+ u32 sub_id;
+ u8 sub_dot1ad;
+ u8 sub_number_of_tags;
+ u16 sub_outer_vlan_id;
+ u16 sub_inner_vlan_id;
+ u8 sub_exact_match;
+ u8 sub_default;
+ u8 sub_outer_vlan_id_any;
+ u8 sub_inner_vlan_id_any;
+ u32 vtr_op;
+ u32 vtr_push_dot1q;
+ u32 vtr_tag1;
+ u32 vtr_tag2;
+} sw_interface_details_t;
+
+typedef struct {
+ u8 * interface_name;
+ u32 sw_if_index;
+ /*
+ * Subinterface ID. A number 0-N to uniquely identify
+ * this subinterface under the super interface
+ */
+ u32 sub_id;
+
+ /* 0 = dot1q, 1=dot1ad */
+ u8 sub_dot1ad;
+
+ /* Number of tags 0-2 */
+ u8 sub_number_of_tags;
+ u16 sub_outer_vlan_id;
+ u16 sub_inner_vlan_id;
+ u8 sub_exact_match;
+ u8 sub_default;
+ u8 sub_outer_vlan_id_any;
+ u8 sub_inner_vlan_id_any;
+
+ /* vlan tag rewrite */
+ u32 vtr_op;
+ u32 vtr_push_dot1q;
+ u32 vtr_tag1;
+ u32 vtr_tag2;
+} sw_interface_subif_t;
+
+typedef struct {
+ u64 ip4;
+ u64 ip6;
+ u64 unicast;
+ u64 multicast;
+ u64 broadcast;
+ u64 discard;
+ u64 fifo_full;
+ u64 error;
+ u64 unknown_proto;
+ u64 miss;
+} packet_counters_t;
+
+typedef struct {
+ u64 octets;
+ packet_counters_t pkts;
+} if_counters_t;
+
+typedef struct {
+ u8 valid;
+ u32 sw_if_index;
+ if_counters_t rx;
+ if_counters_t tx;
+} sw_interface_stats_t;
+
+
+typedef struct {
+ /* Context IDs */
+ volatile u32 context_id_sent;
+ volatile u32 context_id_received;
+
+ /* Spinlock */
+ volatile u32 lock;
+ u32 tag;
+
+ /* To recycle pseudo-synchronous message code from vpe_api_test... */
+ volatile u32 result_ready;
+ volatile i32 retval;
+ volatile u8 *shmem_result;
+
+ /* thread cleanup */
+ pthread_key_t cleanup_rx_thread_key;
+ /* attachment of rx thread to java thread */
+ JNIEnv *jenv;
+ JavaVM *jvm;
+ jclass jcls;
+ jmethodID jmtdIfDetails; // interfaceDetails method
+ uword *callback_hash; // map context_id => jobject
+ uword *ping_hash; // map ping context_id => msg type called
+
+ /* Timestamp */
+ clib_time_t clib_time;
+
+ /* connected indication */
+ u8 is_connected;
+
+ /* context -> non-trivial reply hash */
+ uword * reply_hash;
+ u32 saved_reply_count;
+
+ /* interface name map */
+ uword * sw_if_index_by_interface_name;
+
+ /* interface counters */
+ sw_interface_stats_t * sw_if_stats_by_sw_if_index;
+
+ /* interface table */
+ sw_interface_details_t * sw_if_table;
+
+ /* interface indices of responses to one sw_if_dump request */
+ u8 collect_indices;
+ u32 * sw_if_dump_if_indices;
+
+ /* program name, build_dir, git_version */
+ u8 program_name[32];
+ u8 build_directory[256];
+ u8 git_branch[32];
+ u8 build_date[32];
+
+ /* subinterface table */
+ sw_interface_subif_t * sw_if_subif_table;
+
+ /* main heap */
+ u8 * heap;
+
+ /* convenience */
+ unix_shared_memory_queue_t * vl_input_queue;
+ api_main_t * api_main;
+ u32 my_client_index;
+
+ vjbd_main_t vjbd_main;
+} vppjni_main_t;
+
+vppjni_main_t vppjni_main __attribute__((aligned (64)));
+
+
+static inline u32 vppjni_get_context_id (vppjni_main_t * jm)
+{
+ u32 my_context_id;
+ my_context_id = __sync_add_and_fetch (&jm->context_id_sent, 1);
+ return my_context_id;
+}
+
+static inline void vppjni_lock (vppjni_main_t * jm, u32 tag)
+{
+ while (__sync_lock_test_and_set (&jm->lock, 1))
+ ;
+ jm->tag = tag;
+}
+
+static inline void vppjni_unlock (vppjni_main_t * jm)
+{
+ jm->tag = 0;
+ CLIB_MEMORY_BARRIER();
+ jm->lock = 0;
+}
+
+static inline f64 vppjni_time_now (vppjni_main_t *jm)
+{
+ return clib_time_now (&jm->clib_time);
+}
+
+static inline int vppjni_sanity_check (vppjni_main_t * jm)
+{
+ if (!jm->is_connected)
+ return VNET_API_ERROR_NOT_CONNECTED;
+ return 0;
+}
+
+#define __PACKED(x) x __attribute__((packed))
+
+typedef __PACKED(struct _vl_api_generic_reply {
+ u16 _vl_msg_id;
+ u32 context;
+ i32 retval;
+ u8 data[0];
+}) vl_api_generic_reply_t;
+
+void vl_api_generic_reply_handler (vl_api_generic_reply_t *mp);
+
+/* M: construct, but don't yet send a message */
+
+#define M(T,t) \
+do { \
+ jm->result_ready = 0; \
+ mp = vl_msg_api_alloc(sizeof(*mp)); \
+ memset (mp, 0, sizeof (*mp)); \
+ mp->_vl_msg_id = ntohs (VL_API_##T); \
+ mp->client_index = jm->my_client_index; \
+ } while(0);
+
+#define M2(T,t,n) \
+do { \
+ jm->result_ready = 0; \
+ mp = vl_msg_api_alloc(sizeof(*mp)+(n)); \
+ memset (mp, 0, sizeof (*mp)); \
+ mp->_vl_msg_id = ntohs (VL_API_##T); \
+ mp->client_index = jm->my_client_index; \
+ } while(0);
+
+
+/* S: send a message */
+#define S (vl_msg_api_send_shmem (jm->vl_input_queue, (u8 *)&mp))
+
+/* W: wait for results, with timeout */
+#define W \
+ do { \
+ timeout = vppjni_time_now (jm) + 1.0; \
+ \
+ while (vppjni_time_now (jm) < timeout) { \
+ if (jm->result_ready == 1) { \
+ return (jm->retval); \
+ } \
+ } \
+ return -99; \
+} while(0);
+
+/* WNR: wait for results, with timeout (without returning) */
+#define WNR \
+ do { \
+ timeout = vppjni_time_now (jm) + 1.0; \
+ \
+ rv = -99; \
+ while (vppjni_time_now (jm) < timeout) { \
+ if (jm->result_ready == 1) { \
+ rv = (jm->retval); \
+ break; \
+ } \
+ } \
+} while(0);
+
+#endif /* __included_vppjni_h__ */
diff --git a/vpp-japi/japi/vppjni_bridge_domain.h b/vpp-japi/japi/vppjni_bridge_domain.h
new file mode 100644
index 00000000000..b614a5becb5
--- /dev/null
+++ b/vpp-japi/japi/vppjni_bridge_domain.h
@@ -0,0 +1,510 @@
+/*---------------------------------------------------------------------------
+ * Copyright (c) 2009-2014 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *---------------------------------------------------------------------------
+ */
+
+#ifndef __included_vppjni_bridge_domain_h__
+#define __included_vppjni_bridge_domain_h__
+
+#include <vlib/vlib.h>
+#include <vppinfra/clib.h>
+#include <vppinfra/mhash.h>
+
+/*
+ * The L2fib key is the mac address and bridge domain ID
+ */
+#define MAC_ADDRESS_SIZE 6
+
+typedef struct {
+ union {
+ struct {
+ u16 unused1;
+ u8 mac[MAC_ADDRESS_SIZE];
+ } fields;
+ u64 raw;
+ };
+} l2fib_u64_mac_t;
+
+/*
+ * The l2fib entry results
+ */
+typedef struct {
+ u32 bd_id;
+ l2fib_u64_mac_t mac_addr;
+ u32 sw_if_index;
+ u8 learned:1;
+ u8 bvi:1;
+ u8 filter:1; // drop packets to/from this mac
+ u8 unused1:5;
+} bd_l2fib_oper_t;
+
+typedef struct {
+ u32 bd_id;
+ u8 * bd_name;
+} bd_local_cfg_t;
+
+typedef struct {
+ u32 bd_id;
+ u32 sw_if_index;
+ u32 shg;
+} bd_sw_if_oper_t;
+
+typedef struct {
+ u32 bd_id;
+ u8 flood:1;
+ u8 forward:1;
+ u8 learn:1;
+ u8 uu_flood:1;
+ u8 arp_term:1;
+ u8 unused1:3;
+ u32 bvi_sw_if_index;
+ u32 n_sw_ifs;
+ bd_sw_if_oper_t * bd_sw_if_oper;
+ f64 last_sync_time;
+ mhash_t l2fib_index_by_mac;
+ bd_l2fib_oper_t * l2fib_oper; // vector indexed by l2fib_index
+} vjbd_oper_t;
+
+#define BD_OPER_REFRESH_INTERVAL 2.0
+#define BD_OPER_L2FIB_REFRESH_INTERVAL 5.0
+
+typedef struct {
+ u32 next_bd_id;
+ uword * bd_index_bitmap;
+ uword * bd_index_by_id;
+ mhash_t bd_id_by_name;
+ bd_local_cfg_t * local_cfg; // vector indexed by bd_index
+ vjbd_oper_t * bd_oper; // vector indexed by oper_bd_index
+ f64 bd_oper_last_sync_all_time;
+ bd_sw_if_oper_t * sw_if_oper; // vector indexed by sw_if_index
+ f64 l2fib_oper_last_sync_time;
+ uword * bd_id_by_sw_if_index;
+ uword * oper_bd_index_by_bd_id;
+} vjbd_main_t;
+
+extern vjbd_main_t vjbd_main;
+
+always_inline
+u64 l2fib_mac_to_u64 (u8 * mac_address) {
+ u64 temp;
+
+ // The mac address in memory is A:B:C:D:E:F
+ // The bd id in register is H:L
+#if CLIB_ARCH_IS_LITTLE_ENDIAN
+ // Create the in-register key as F:E:D:C:B:A:H:L
+ // In memory the key is L:H:A:B:C:D:E:F
+ temp = *((u64 *)(mac_address - 2));
+ temp = (temp & ~0xffff);
+#else
+ // Create the in-register key as H:L:A:B:C:D:E:F
+ // In memory the key is H:L:A:B:C:D:E:F
+ temp = *((u64 *)(mac_address)) >> 16;
+#endif
+
+ return temp;
+}
+
+static_always_inline void vjbd_main_init (vjbd_main_t *bdm)
+{
+ bdm->bd_index_by_id = hash_create (0, sizeof(uword));
+ mhash_init_vec_string (&bdm->bd_id_by_name, sizeof (u32));
+ bdm->bd_id_by_sw_if_index = hash_create (0, sizeof (u32));
+ bdm->oper_bd_index_by_bd_id = hash_create (0, sizeof (u32));
+}
+
+static_always_inline u32 vjbd_id_is_valid (vjbd_main_t * bdm, u32 bd_id)
+{
+ return ((bd_id != 0) && (bd_id != ~0) && (bd_id <= bdm->next_bd_id));
+}
+
+static_always_inline u32 vjbd_index_is_free (vjbd_main_t * bdm, u16 bd_index)
+{
+ u32 bd_id = vec_elt_at_index(bdm->local_cfg, bd_index)->bd_id;
+
+ return (!clib_bitmap_get (bdm->bd_index_bitmap, (bd_index)) &&
+ (bd_index < vec_len (bdm->local_cfg)) &&
+ ((bd_id == 0) || (bd_id == ~0)));
+}
+
+static_always_inline u32 vjbd_index_is_valid (vjbd_main_t * bdm, u16 bd_index)
+{
+ return (clib_bitmap_get (bdm->bd_index_bitmap, bd_index) &&
+ (bd_index < vec_len (bdm->local_cfg)));
+}
+
+static_always_inline u32 vjbd_id_from_name (vjbd_main_t * bdm,
+ const u8 * bd_name)
+{
+ u32 bd_id;
+ uword * p;
+
+ ASSERT (vec_c_string_is_terminated (bd_name));
+
+ if (bdm->next_bd_id == 0)
+ return ~0;
+
+ p = mhash_get (&bdm->bd_id_by_name, (void *)bd_name);
+ if (p)
+ {
+ bd_id = p[0];
+ ASSERT (vjbd_id_is_valid (bdm, bd_id));
+ }
+ else
+ bd_id = ~0;
+
+ return bd_id;
+}
+
+static_always_inline u32 vjbd_index_from_id (vjbd_main_t * bdm, u32 bd_id)
+{
+ uword * p;
+ u16 bd_index;
+
+ ASSERT (vjbd_id_is_valid (bdm, bd_id));
+
+ p = hash_get (bdm->bd_index_by_id, bd_id);
+
+ ASSERT (p); // there is always an index associated with a valid bd_id
+ bd_index = p[0];
+
+ ASSERT (vjbd_index_is_valid (bdm, bd_index));
+
+ return bd_index;
+}
+
+static_always_inline u32 vjbd_id_from_index (vjbd_main_t * bdm, u16 bd_index)
+{
+ u32 bd_id;
+
+ ASSERT (vjbd_index_is_valid (bdm, bd_index));
+
+ bd_id = vec_elt_at_index(bdm->local_cfg, bd_index)->bd_id;
+
+ ASSERT (vjbd_id_is_valid (bdm, bd_id));
+
+ return bd_id;
+}
+
+static_always_inline u8 * vjbd_name_from_id (vjbd_main_t * bdm, u32 bd_id)
+{
+ u16 bd_index = vjbd_index_from_id (bdm, bd_id);
+
+ return vec_elt_at_index(bdm->local_cfg, bd_index)->bd_name;
+}
+
+static_always_inline u8 * vjbd_oper_name_from_id (vjbd_main_t * bdm, u32 bd_id)
+{
+ if (vjbd_id_is_valid (bdm, bd_id)) {
+ return format(0, "%s", vjbd_name_from_id(bdm, bd_id));
+ } else {
+ return format(0, "BridgeDomainOper%d", bd_id);
+ }
+}
+
+static_always_inline vjbd_oper_t * vjbd_oper_from_id (vjbd_main_t * bdm,
+ u32 bd_id)
+{
+ u16 bd_index = vjbd_index_from_id (bdm, bd_id);
+ return vec_elt_at_index (bdm->bd_oper, bd_index);
+}
+
+static_always_inline void vjbd_oper_maybe_sync_from_vpp (vjbd_main_t * bdm,
+ u32 bd_id)
+{
+#ifdef VPPJNI_OPER
+ vppjni_vpe_api_msg_main_t *ovam = ovam_get_main ();
+
+ if (bd_id == ~0)
+ {
+ if ((ovam_time_now (ovam) - bdm->bd_oper_last_sync_all_time) >
+ BD_OPER_REFRESH_INTERVAL)
+ {
+ ovam_bridge_domain_dump (bd_id);
+ bdm->bd_oper_last_sync_all_time = ovam_time_now (ovam);
+ }
+ }
+
+ else
+ {
+ vjbd_oper_t * bd_oper = vjbd_oper_from_id (bdm, bd_id);
+
+ if ((ovam_time_now (ovam) - bd_oper->last_sync_time) >
+ BD_OPER_REFRESH_INTERVAL)
+ {
+ ovam_bridge_domain_dump (bd_id);
+
+ bd_oper->last_sync_time = ovam_time_now (ovam);
+ }
+ }
+#endif
+}
+
+static_always_inline u32 vjbd_id_from_sw_if_index (vjbd_main_t * bdm,
+ u32 sw_if_index)
+{
+ bd_sw_if_oper_t * bd_sw_if_oper;
+ u32 bd_id = ~0;
+
+ vjbd_oper_maybe_sync_from_vpp (bdm, ~0);
+ if (sw_if_index < vec_len (bdm->sw_if_oper))
+ {
+ bd_sw_if_oper = vec_elt_at_index (bdm->sw_if_oper, sw_if_index);
+ bd_id = bd_sw_if_oper->bd_id;
+ }
+
+ return bd_id;
+}
+
+static_always_inline u8 * vjbd_name_from_sw_if_index (vjbd_main_t * bdm,
+ u32 sw_if_index)
+{
+ u32 bd_id, bd_index;
+ u8 * bd_name = 0;
+
+ /* DAW-FIXME:
+ ASSERT (ovam_sw_if_index_valid (ovam_get_main(), sw_if_index));
+ */
+ vjbd_oper_maybe_sync_from_vpp (bdm, ~0);
+ bd_id = vjbd_id_from_sw_if_index (bdm, sw_if_index);
+ if (vjbd_id_is_valid (bdm, bd_id))
+ {
+ bd_index = vjbd_index_from_id (bdm, bd_id);
+ bd_name = vec_elt_at_index (bdm->local_cfg, bd_index)->bd_name;
+ }
+
+ return bd_name;
+}
+
+static_always_inline u32
+vjbd_oper_l2fib_index_from_mac (vjbd_oper_t * bd_oper, u8 * mac)
+{
+ u32 l2fib_index;
+ uword * p;
+
+ p = mhash_get (&bd_oper->l2fib_index_by_mac, mac);
+ if (p)
+ {
+ l2fib_index = p[0];
+ ASSERT (l2fib_index < vec_len (bd_oper->l2fib_oper));
+ }
+ else
+ l2fib_index = ~0;
+
+ return l2fib_index;
+}
+
+static_always_inline u32 vjbd_local_cfg_next_id (vjbd_main_t * bdm,
+ u32 bd_id)
+{
+ u32 i, end = vec_len (bdm->local_cfg);
+ u32 next_bd_id = 0;
+
+ if ((bd_id == 0) || vjbd_id_is_valid (bdm, bd_id))
+ for (i = 0; i < end; i++)
+ {
+ u32 curr_bd_id = bdm->local_cfg[i].bd_id;
+ if ((curr_bd_id != ~0) && (curr_bd_id > bd_id) &&
+ ((next_bd_id == 0) || (curr_bd_id < next_bd_id)))
+ next_bd_id = curr_bd_id;
+ }
+
+ return next_bd_id;
+}
+
+static_always_inline u32 vjbd_sw_if_oper_next_index (vjbd_main_t * bdm,
+ u32 start, u32 bd_id)
+{
+ u32 i, end = vec_len (bdm->sw_if_oper);
+
+ if (vjbd_id_is_valid (bdm, bd_id))
+ for (i = start; i < end; i++)
+ if (bdm->sw_if_oper[i].bd_id == bd_id)
+ return i;
+
+ return ~0;
+}
+
+static_always_inline void
+vjbd_oper_l2fib_maybe_sync_from_vpp (vjbd_main_t * bdm)
+{
+#ifdef VPPJNI_OPER
+ vppjni_vpe_api_msg_main_t *ovam = ovam_get_main ();
+ if ((ovam_time_now (ovam) - bdm->l2fib_oper_last_sync_time) >
+ BD_OPER_L2FIB_REFRESH_INTERVAL)
+ {
+ ovam_l2fib_table_dump ();
+ bdm->l2fib_oper_last_sync_time = ovam_time_now (ovam);
+ }
+#endif
+}
+
+static_always_inline void vjbd_l2fib_oper_reset (vjbd_main_t * bdm)
+{
+ vjbd_oper_t * bd_oper;
+
+ vec_foreach (bd_oper, bdm->bd_oper)
+ {
+ mhash_init (&bd_oper->l2fib_index_by_mac, sizeof (u32), MAC_ADDRESS_SIZE);
+ vec_reset_length (bd_oper->l2fib_oper);
+ }
+}
+
+static_always_inline void vjbd_oper_reset (vjbd_main_t * bdm, u32 bd_id)
+{
+ u16 bd_index;
+ u32 si, len;
+ vjbd_oper_t * bd_oper;
+ u32 end;
+
+ if (!bdm->bd_oper)
+ {
+ ASSERT (vec_len (bdm->sw_if_oper) == 0);
+ return;
+ }
+
+ if (bd_id == ~0)
+ {
+ bdm->bd_oper_last_sync_all_time = 0.0;
+ bd_index = 0;
+ end = vec_len (bdm->bd_oper);
+ }
+ else
+ {
+ bd_index = vjbd_index_from_id (bdm, bd_id);
+ end = bd_index + 1;
+ }
+
+ for (; bd_index < end; bd_index++)
+ {
+ bd_oper = vec_elt_at_index (bdm->bd_oper, bd_index);
+ bd_oper->last_sync_time = 0.0;
+
+ len = vec_len (bdm->sw_if_oper);
+ for (si = vjbd_sw_if_oper_next_index (bdm, 0, bd_id);
+ (si != ~0) && (si < len);
+ si = vjbd_sw_if_oper_next_index (bdm, si + 1, bd_id))
+ {
+ bd_sw_if_oper_t * bd_sw_if_oper;
+
+ bd_sw_if_oper = vec_elt_at_index (bdm->sw_if_oper, si);
+ bd_sw_if_oper->bd_id = ~0;
+ }
+ }
+}
+
+static_always_inline void
+vjbd_sw_if_add_del (u32 sw_if_index ,u32 bd_id, u8 bvi, u8 shg, u8 is_add)
+{
+ vjbd_main_t * bdm = &vjbd_main;
+ u16 bd_index = vjbd_index_from_id (bdm, bd_id);
+ vjbd_oper_t * bd_oper = vec_elt_at_index (bdm->bd_oper, bd_index);
+ bd_sw_if_oper_t * bd_sw_if_oper;
+
+ ASSERT (vjbd_id_is_valid (bdm, bd_id));
+ /* DAW-FIXME
+ ASSERT (ovam_sw_if_index_valid (ovam_get_main (), sw_if_index));
+ */
+
+ vec_validate (bdm->sw_if_oper, sw_if_index);
+ bd_sw_if_oper = vec_elt_at_index (bdm->sw_if_oper, sw_if_index);
+ if (is_add)
+ {
+ bd_sw_if_oper->bd_id = bd_id;
+ bd_sw_if_oper->shg = shg;
+ bd_oper->bvi_sw_if_index = bvi ? sw_if_index : ~0;
+ }
+ else
+ {
+ bd_sw_if_oper->bd_id = 0;
+ bd_sw_if_oper->shg = 0;
+ if (bd_oper->bvi_sw_if_index == sw_if_index)
+ bd_oper->bvi_sw_if_index = ~0;
+ }
+}
+
+static_always_inline u32 vjbd_id_sw_if_count (vjbd_main_t * bdm, u32 bd_id)
+{
+ u32 count = 0, i, end = vec_len (bdm->sw_if_oper);
+
+ if (vjbd_id_is_valid (bdm, bd_id))
+ for (count = i = 0; i < end; i++)
+ if (bdm->sw_if_oper[i].bd_id == bd_id)
+ count++;
+
+ return count;
+}
+
+static_always_inline u32 vjbd_find_or_add_bd (vjbd_main_t * bdm, u8 * bd_name)
+{
+ u16 bd_index;
+ u32 bd_id;
+ bd_local_cfg_t * bd_local_cfg;
+ uword mhash_val_bd_id;
+
+ bd_id = vjbd_id_from_name (bdm, bd_name);
+ if (bd_id != ~0)
+ return bd_id;
+
+ mhash_val_bd_id = bd_id = ++bdm->next_bd_id;
+ mhash_set_mem (&bdm->bd_id_by_name, (void *)bd_name, &mhash_val_bd_id, 0);
+
+ bd_index = clib_bitmap_first_clear (bdm->bd_index_bitmap);
+ vec_validate (bdm->local_cfg, bd_index);
+ vec_validate (bdm->bd_oper, bd_index);
+
+ ASSERT (vjbd_index_is_free (bdm, bd_index));
+
+ bd_local_cfg = vec_elt_at_index (bdm->local_cfg, bd_index);
+ bd_local_cfg->bd_id = bd_id;
+ vec_validate_init_c_string (bd_local_cfg->bd_name, bd_name,
+ vec_len (bd_name) - 1);
+ hash_set (bdm->bd_index_by_id, bd_id, bd_index);
+ bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap,
+ bd_index, 1);
+ return bd_id;
+}
+
+static_always_inline void vjbd_delete_bd (vjbd_main_t * bdm, u32 bd_id)
+{
+ u16 bd_index;
+ bd_local_cfg_t * bd_local_cfg;
+
+ ASSERT (vjbd_id_is_valid (bdm, bd_id));
+
+ // bd must not have any members before deleting
+ ASSERT (!vjbd_id_sw_if_count (bdm, bd_id));
+
+ bd_index = vjbd_index_from_id (bdm, bd_id);
+ bd_local_cfg = vec_elt_at_index (bdm->local_cfg, bd_index);
+ vjbd_oper_reset (bdm, bd_id);
+
+ mhash_unset (&bdm->bd_id_by_name, vjbd_name_from_id (bdm, bd_id), 0);
+ bdm->bd_index_bitmap = clib_bitmap_set (bdm->bd_index_bitmap,
+ bd_index, 0);
+ hash_unset (bdm->bd_index_by_id, bd_id);
+ bd_local_cfg->bd_id = ~0;
+ vec_validate_init_c_string (bd_local_cfg->bd_name, "", 0);
+
+ if (clib_bitmap_is_zero (bdm->bd_index_bitmap))
+ {
+ vec_reset_length (bdm->local_cfg);
+ vec_reset_length (bdm->bd_oper);
+ }
+
+ /* Force a resync of all bd_oper data. */
+ bdm->bd_oper_last_sync_all_time = 0.0;
+ vjbd_oper_maybe_sync_from_vpp (bdm, ~0);
+}
+
+#endif /* __included_vppjni_vpp_bridge_domain_h__ */