Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (c) 2015 Cisco and/or its affiliates. |
| 3 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | * you may not use this file except in compliance with the License. |
| 5 | * You may obtain a copy of the License at: |
| 6 | * |
| 7 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | * |
| 9 | * Unless required by applicable law or agreed to in writing, software |
| 10 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | * See the License for the specific language governing permissions and |
| 13 | * limitations under the License. |
| 14 | */ |
Robert Varga | 40223da | 2016-02-10 15:57:23 +0100 | [diff] [blame] | 15 | #define _GNU_SOURCE /* for strcasestr(3) */ |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 16 | #include <vnet/vnet.h> |
| 17 | |
| 18 | #define vl_api_version(n,v) static u32 vpe_api_version = (v); |
| 19 | #include <api/vpe.api.h> |
| 20 | #undef vl_api_version |
| 21 | |
| 22 | #include <jni.h> |
| 23 | #include <japi/vppjni.h> |
| 24 | #include <japi/vppjni_bridge_domain.h> |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 25 | #include <japi/vppjni_env.h> |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 26 | #include <japi/org_openvpp_vppjapi_vppConn.h> |
| 27 | #include <japi/org_openvpp_vppjapi_vppApi.h> |
| 28 | |
| 29 | #include <api/vpe_msg_enum.h> |
| 30 | #define vl_typedefs /* define message structures */ |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 31 | #include <api/vpe_all_api_h.h> |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 32 | #undef vl_typedefs |
| 33 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 34 | #define vl_endianfun |
| 35 | #include <api/vpe_all_api_h.h> |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 36 | #undef vl_endianfun |
| 37 | |
| 38 | /* instantiate all the print functions we know about */ |
| 39 | #define vl_print(handle, ...) |
| 40 | #define vl_printfun |
| 41 | #include <api/vpe_all_api_h.h> |
| 42 | #undef vl_printfun |
| 43 | |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 44 | #define VPPJNI_DEBUG 0 |
| 45 | |
| 46 | #if VPPJNI_DEBUG == 1 |
| 47 | #define DEBUG_LOG(...) clib_warning(__VA_ARGS__) |
| 48 | #else |
| 49 | #define DEBUG_LOG(...) |
| 50 | #endif |
| 51 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 52 | static int connect_to_vpe(char *name); |
| 53 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 54 | /* |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 55 | * The Java runtime isn't compile w/ -fstack-protector, |
| 56 | * so we have to supply missing external references for the |
| 57 | * regular vpp libraries. Weak reference in case folks get religion |
| 58 | * at a later date... |
| 59 | */ |
| 60 | void __stack_chk_guard (void) __attribute__((weak)); |
| 61 | void __stack_chk_guard (void) { } |
| 62 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 63 | BIND_JAPI_CLASS(vppBridgeDomainDetails, "()V"); |
| 64 | BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, arpTerm); |
| 65 | BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, flood); |
| 66 | BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, forward); |
| 67 | BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, learn); |
| 68 | BIND_JAPI_BOOL_FIELD(vppBridgeDomainDetails, uuFlood); |
| 69 | BIND_JAPI_INT_FIELD(vppBridgeDomainDetails, bdId); |
| 70 | BIND_JAPI_STRING_FIELD(vppBridgeDomainDetails, name); |
| 71 | BIND_JAPI_STRING_FIELD(vppBridgeDomainDetails, bviInterfaceName); |
| 72 | BIND_JAPI_OBJ_FIELD(vppBridgeDomainDetails, interfaces, "[Lorg/openvpp/vppjapi/vppBridgeDomainInterfaceDetails;"); |
| 73 | |
| 74 | BIND_JAPI_CLASS(vppBridgeDomainInterfaceDetails, "()V"); |
| 75 | BIND_JAPI_BYTE_FIELD(vppBridgeDomainInterfaceDetails, splitHorizonGroup); |
| 76 | BIND_JAPI_STRING_FIELD(vppBridgeDomainInterfaceDetails, interfaceName); |
| 77 | |
| 78 | BIND_JAPI_CLASS(vppInterfaceCounters, "(JJJJJJJJJJJJJJJJJJJJJJ)V"); |
Pavel | 84e4ffe | 2016-02-17 15:10:04 +0100 | [diff] [blame^] | 79 | BIND_JAPI_CLASS(vppInterfaceDetails, "(ILjava/lang/String;I[BBBBBIBBIIBBBBIIIII)V"); |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 80 | BIND_JAPI_CLASS(vppIPv4Address, "(IB)V"); |
| 81 | BIND_JAPI_CLASS(vppIPv6Address, "([BB)V"); |
| 82 | BIND_JAPI_CLASS(vppL2Fib, "([BZLjava/lang/String;ZZ)V"); |
| 83 | BIND_JAPI_CLASS(vppVersion, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); |
| 84 | BIND_JAPI_CLASS(vppVxlanTunnelDetails, "(IIIII)V"); |
| 85 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 86 | void vl_client_add_api_signatures (vl_api_memclnt_create_t *mp) |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 87 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 88 | /* |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 89 | * Send the main API signature in slot 0. This bit of code must |
| 90 | * match the checks in ../vpe/api/api.c: vl_msg_api_version_check(). |
| 91 | */ |
| 92 | mp->api_versions[0] = clib_host_to_net_u32 (vpe_api_version); |
| 93 | } |
| 94 | |
| 95 | /* Note: non-static, called once to set up the initial intfc table */ |
| 96 | static int sw_interface_dump (vppjni_main_t * jm) |
| 97 | { |
| 98 | vl_api_sw_interface_dump_t *mp; |
| 99 | f64 timeout; |
| 100 | hash_pair_t * p; |
| 101 | name_sort_t * nses = 0, * ns; |
| 102 | sw_interface_subif_t * sub = NULL; |
| 103 | |
| 104 | /* Toss the old name table */ |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 105 | hash_foreach_pair (p, jm->sw_if_index_by_interface_name, |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 106 | ({ |
| 107 | vec_add2 (nses, ns, 1); |
| 108 | ns->name = (u8 *)(p->key); |
| 109 | ns->value = (u32) p->value[0]; |
| 110 | })); |
| 111 | |
| 112 | hash_free (jm->sw_if_index_by_interface_name); |
| 113 | |
| 114 | vec_foreach (ns, nses) |
| 115 | vec_free (ns->name); |
| 116 | |
| 117 | vec_free (nses); |
| 118 | |
| 119 | vec_foreach (sub, jm->sw_if_subif_table) { |
| 120 | vec_free (sub->interface_name); |
| 121 | } |
| 122 | vec_free (jm->sw_if_subif_table); |
| 123 | |
| 124 | /* recreate the interface name hash table */ |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 125 | jm->sw_if_index_by_interface_name |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 126 | = hash_create_string (0, sizeof(uword)); |
| 127 | |
| 128 | /* Get list of ethernets */ |
| 129 | M(SW_INTERFACE_DUMP, sw_interface_dump); |
| 130 | mp->name_filter_valid = 1; |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 131 | strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter-1)); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 132 | S; |
| 133 | |
| 134 | /* and local / loopback interfaces */ |
| 135 | M(SW_INTERFACE_DUMP, sw_interface_dump); |
| 136 | mp->name_filter_valid = 1; |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 137 | strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter-1)); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 138 | S; |
| 139 | |
| 140 | /* and vxlan tunnel interfaces */ |
| 141 | M(SW_INTERFACE_DUMP, sw_interface_dump); |
| 142 | mp->name_filter_valid = 1; |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 143 | strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter-1)); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 144 | S; |
| 145 | |
| 146 | /* and tap tunnel interfaces */ |
| 147 | M(SW_INTERFACE_DUMP, sw_interface_dump); |
| 148 | mp->name_filter_valid = 1; |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 149 | strncpy ((char *) mp->name_filter, "tap", sizeof(mp->name_filter-1)); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 150 | S; |
| 151 | |
| 152 | /* and l2tpv3 tunnel interfaces */ |
| 153 | M(SW_INTERFACE_DUMP, sw_interface_dump); |
| 154 | mp->name_filter_valid = 1; |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 155 | strncpy ((char *) mp->name_filter, "l2tpv3_tunnel", |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 156 | sizeof(mp->name_filter-1)); |
| 157 | S; |
| 158 | |
| 159 | /* Use a control ping for synchronization */ |
| 160 | { |
| 161 | vl_api_control_ping_t * mp; |
| 162 | M(CONTROL_PING, control_ping); |
| 163 | S; |
| 164 | } |
| 165 | W; |
| 166 | } |
| 167 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 168 | JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getVppVersion0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 169 | (JNIEnv *env, jobject obj) |
| 170 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 171 | vppjni_main_t * jm = &vppjni_main; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 172 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 173 | vppjni_lock (jm, 11); |
| 174 | jstring progName = (*env)->NewStringUTF(env, (char *)jm->program_name); |
| 175 | jstring buildDir = (*env)->NewStringUTF(env, (char *)jm->build_directory); |
| 176 | jstring version = (*env)->NewStringUTF(env, (char *)jm->version); |
| 177 | jstring buildDate = (*env)->NewStringUTF(env, (char *)jm->build_date); |
| 178 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 179 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 180 | return vppVersionObject(env, progName, buildDir, version, buildDate); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 181 | } |
| 182 | |
| 183 | static int jm_show_version (vppjni_main_t *jm) |
| 184 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 185 | int rv; |
| 186 | vl_api_show_version_t *mp; |
| 187 | f64 timeout; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 188 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 189 | vppjni_lock (jm, 10); |
| 190 | M(SHOW_VERSION, show_version); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 191 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 192 | S; |
| 193 | vppjni_unlock (jm); |
| 194 | WNR; |
| 195 | return rv; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 196 | } |
| 197 | |
| 198 | static int jm_stats_enable_disable (vppjni_main_t *jm, u8 enable) |
| 199 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 200 | vl_api_want_stats_t * mp; |
| 201 | f64 timeout; |
| 202 | int rv; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 203 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 204 | vppjni_lock (jm, 13); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 205 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 206 | M(WANT_STATS, want_stats); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 207 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 208 | mp->enable_disable = enable; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 209 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 210 | S; |
| 211 | vppjni_unlock (jm); |
| 212 | WNR; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 213 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 214 | // already subscribed / already disabled (it's ok) |
| 215 | if (rv == -2 || rv == -3) |
| 216 | rv = 0; |
| 217 | return rv; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 218 | } |
| 219 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 220 | JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_setInterfaceDescription0 |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 221 | (JNIEnv *env, jobject obj, jstring ifName, jstring ifDesc) |
| 222 | { |
| 223 | int rv = 0; |
| 224 | vppjni_main_t * jm = &vppjni_main; |
| 225 | uword * p; |
| 226 | u32 sw_if_index = ~0; |
| 227 | sw_if_config_t *cfg; |
| 228 | |
| 229 | const char *if_name_str = (*env)->GetStringUTFChars (env, ifName, 0); |
| 230 | const char *if_desc_str = (*env)->GetStringUTFChars (env, ifDesc, 0); |
| 231 | |
| 232 | vppjni_lock (jm, 23); |
| 233 | |
| 234 | p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name_str); |
| 235 | if (p == 0) { |
| 236 | rv = -1; |
| 237 | goto out; |
| 238 | } |
| 239 | sw_if_index = (jint) p[0]; |
| 240 | |
| 241 | u8 *if_desc = 0; |
| 242 | vec_validate_init_c_string (if_desc, if_desc_str, strlen(if_desc_str)); |
| 243 | (*env)->ReleaseStringUTFChars (env, ifDesc, if_desc_str); |
| 244 | |
| 245 | p = hash_get (jm->sw_if_config_by_sw_if_index, sw_if_index); |
| 246 | if (p != 0) { |
| 247 | cfg = (sw_if_config_t *) (p[0]); |
| 248 | if (cfg->desc) |
| 249 | vec_free(cfg->desc); |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 250 | } else { |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 251 | cfg = (sw_if_config_t *) clib_mem_alloc(sizeof(sw_if_config_t)); |
| 252 | hash_set (jm->sw_if_config_by_sw_if_index, sw_if_index, cfg); |
| 253 | } |
| 254 | |
| 255 | cfg->desc = if_desc; |
| 256 | |
| 257 | out: |
| 258 | (*env)->ReleaseStringUTFChars (env, ifName, if_name_str); |
| 259 | vppjni_unlock (jm); |
| 260 | return rv; |
| 261 | } |
| 262 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 263 | JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceDescription0 |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 264 | (JNIEnv * env, jobject obj, jstring ifName) |
| 265 | { |
| 266 | vppjni_main_t * jm = &vppjni_main; |
| 267 | u32 sw_if_index = ~0; |
| 268 | uword * p; |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 269 | jstring ifDesc = NULL; |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 270 | const char *if_name_str = (*env)->GetStringUTFChars (env, ifName, 0); |
| 271 | if (!if_name_str) |
| 272 | return NULL; |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 273 | |
| 274 | vppjni_lock (jm, 24); |
| 275 | p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name_str); |
| 276 | if (p == 0) |
| 277 | goto out; |
| 278 | |
| 279 | sw_if_index = (jint) p[0]; |
| 280 | |
| 281 | p = hash_get (jm->sw_if_config_by_sw_if_index, sw_if_index); |
| 282 | if (p == 0) |
| 283 | goto out; |
| 284 | |
| 285 | sw_if_config_t *cfg = (sw_if_config_t *) (p[0]); |
| 286 | u8 * s = format (0, "%s%c", cfg->desc, 0); |
| 287 | ifDesc = (*env)->NewStringUTF(env, (char *)s); |
| 288 | |
| 289 | out: |
| 290 | vppjni_unlock (jm); |
| 291 | |
| 292 | return ifDesc; |
| 293 | } |
| 294 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 295 | JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_clientConnect |
| 296 | (JNIEnv *env, jobject obj, jstring clientName) |
| 297 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 298 | int rv; |
| 299 | const char *client_name; |
| 300 | void vl_msg_reply_handler_hookup(void); |
| 301 | vppjni_main_t * jm = &vppjni_main; |
| 302 | api_main_t * am = &api_main; |
| 303 | u8 * heap; |
| 304 | mheap_t * h; |
| 305 | f64 timeout; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 306 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 307 | /* |
| 308 | * Bail out now if we're not running as root |
| 309 | */ |
| 310 | if (geteuid() != 0) |
| 311 | return -1; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 312 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 313 | if (jm->is_connected) |
| 314 | return -2; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 315 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 316 | client_name = (*env)->GetStringUTFChars(env, clientName, 0); |
| 317 | if (!client_name) |
| 318 | return -3; |
| 319 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 320 | if (jm->heap == 0) |
| 321 | clib_mem_init (0, 128<<20); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 322 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 323 | heap = clib_mem_get_per_cpu_heap(); |
| 324 | h = mheap_header (heap); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 325 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 326 | clib_time_init (&jm->clib_time); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 327 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 328 | rv = connect_to_vpe ((char *) client_name); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 329 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 330 | if (rv < 0) |
| 331 | clib_warning ("connection failed, rv %d", rv); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 332 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 333 | (*env)->ReleaseStringUTFChars (env, clientName, client_name); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 334 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 335 | if (rv == 0) { |
| 336 | vl_msg_reply_handler_hookup (); |
| 337 | jm->is_connected = 1; |
| 338 | /* make the main heap thread-safe */ |
| 339 | h->flags |= MHEAP_FLAG_THREAD_SAFE; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 340 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 341 | jm->reply_hash = hash_create (0, sizeof (uword)); |
| 342 | //jm->callback_hash = hash_create (0, sizeof (uword)); |
| 343 | //jm->ping_hash = hash_create (0, sizeof (uword)); |
| 344 | jm->api_main = am; |
| 345 | vjbd_main_init(&jm->vjbd_main); |
| 346 | jm->sw_if_index_by_interface_name = |
| 347 | hash_create_string (0, sizeof (uword)); |
| 348 | jm->sw_if_config_by_sw_if_index = |
| 349 | hash_create (0, sizeof (uword)); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 350 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 351 | { |
| 352 | // call control ping first to attach rx thread to java thread |
| 353 | vl_api_control_ping_t * mp; |
| 354 | M(CONTROL_PING, control_ping); |
| 355 | S; |
| 356 | WNR; |
| 357 | |
| 358 | if (rv != 0) { |
| 359 | clib_warning ("first control ping failed: %d", rv); |
| 360 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 361 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 362 | rv = jm_show_version(jm); |
| 363 | if (rv != 0) |
| 364 | clib_warning ("unable to retrieve vpp version (rv: %d)", rv); |
| 365 | rv = sw_interface_dump(jm); |
| 366 | if (rv != 0) |
| 367 | clib_warning ("unable to retrieve interface list (rv: %d)", rv); |
| 368 | rv = jm_stats_enable_disable(jm, 1); |
| 369 | if (rv != 0) |
| 370 | clib_warning ("unable to subscribe to stats (rv: %d)", rv); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 371 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 372 | DEBUG_LOG ("clientConnect result: %d", rv); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 373 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 374 | return rv; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 375 | } |
| 376 | |
| 377 | JNIEXPORT void JNICALL Java_org_openvpp_vppjapi_vppConn_clientDisconnect |
| 378 | (JNIEnv *env, jobject obj) |
| 379 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 380 | u8 *save_heap; |
| 381 | vppjni_main_t * jm = &vppjni_main; |
| 382 | vl_client_disconnect_from_vlib(); |
| 383 | |
| 384 | save_heap = jm->heap; |
| 385 | memset (jm, 0, sizeof (*jm)); |
| 386 | jm->heap = save_heap; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 387 | } |
| 388 | |
| 389 | void vl_api_generic_reply_handler (vl_api_generic_reply_t *mp) |
| 390 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 391 | api_main_t * am = &api_main; |
| 392 | u16 msg_id = clib_net_to_host_u16 (mp->_vl_msg_id); |
| 393 | trace_cfg_t *cfgp; |
| 394 | i32 retval = clib_net_to_host_u32 (mp->retval); |
| 395 | int total_bytes = sizeof(mp); |
| 396 | vppjni_main_t * jm = &vppjni_main; |
| 397 | u8 * saved_reply = 0; |
| 398 | u32 context = clib_host_to_net_u32 (mp->context); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 399 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 400 | cfgp = am->api_trace_cfg + msg_id; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 401 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 402 | if (!cfgp) |
| 403 | clib_warning ("msg id %d: no trace configuration\n", msg_id); |
| 404 | else |
| 405 | total_bytes = cfgp->size; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 406 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 407 | jm->context_id_received = context; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 408 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 409 | DEBUG_LOG ("Received generic reply for msg id %d", msg_id); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 410 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 411 | /* A generic reply, successful, we're done */ |
| 412 | if (retval >= 0 && total_bytes == sizeof(*mp)) |
| 413 | return; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 414 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 415 | /* Save the reply */ |
| 416 | vec_validate (saved_reply, total_bytes - 1); |
| 417 | memcpy (saved_reply, mp, total_bytes); |
| 418 | |
| 419 | vppjni_lock (jm, 2); |
| 420 | hash_set (jm->reply_hash, context, saved_reply); |
| 421 | jm->saved_reply_count ++; |
| 422 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 423 | } |
| 424 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 425 | JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_getRetval0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 426 | (JNIEnv * env, jobject obj, jint context, jint release) |
| 427 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 428 | vppjni_main_t * jm = &vppjni_main; |
| 429 | vl_api_generic_reply_t * mp; |
| 430 | uword * p; |
| 431 | int rv = 0; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 432 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 433 | /* Dunno yet? */ |
| 434 | if (context > jm->context_id_received) |
| 435 | return (VNET_API_ERROR_RESPONSE_NOT_READY); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 436 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 437 | vppjni_lock (jm, 1); |
| 438 | p = hash_get (jm->reply_hash, context); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 439 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 440 | /* |
| 441 | * Two cases: a generic "yes" reply - won't be in the hash table |
| 442 | * or "no", or "more data" which will be in the table. |
| 443 | */ |
| 444 | if (p == 0) |
| 445 | goto out; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 446 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 447 | mp = (vl_api_generic_reply_t *) (p[0]); |
| 448 | rv = clib_net_to_host_u32 (mp->retval); |
| 449 | |
| 450 | if (release) { |
| 451 | u8 * free_me = (u8 *) mp; |
| 452 | vec_free (free_me); |
| 453 | hash_unset (jm->reply_hash, context); |
| 454 | jm->saved_reply_count --; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 455 | } |
| 456 | |
| 457 | out: |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 458 | vppjni_unlock (jm); |
| 459 | return (rv); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 460 | } |
| 461 | |
Matus Fabian | d2dc3df | 2015-12-14 10:31:33 -0500 | [diff] [blame] | 462 | static int |
| 463 | name_sort_cmp (void * a1, void * a2) |
| 464 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 465 | name_sort_t * n1 = a1; |
| 466 | name_sort_t * n2 = a2; |
Matus Fabian | d2dc3df | 2015-12-14 10:31:33 -0500 | [diff] [blame] | 467 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 468 | return strcmp ((char *)n1->name, (char *)n2->name); |
Matus Fabian | d2dc3df | 2015-12-14 10:31:33 -0500 | [diff] [blame] | 469 | } |
| 470 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 471 | JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceList0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 472 | (JNIEnv * env, jobject obj, jstring name_filter) |
| 473 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 474 | vppjni_main_t * jm = &vppjni_main; |
| 475 | jstring rv; |
| 476 | hash_pair_t * p; |
| 477 | name_sort_t * nses = 0, * ns; |
| 478 | const char *this_name; |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 479 | u8 * s = 0; |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 480 | const char * nf = (*env)->GetStringUTFChars (env, name_filter, NULL); |
| 481 | if (!nf) |
| 482 | return NULL; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 483 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 484 | vppjni_lock (jm, 4); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 485 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 486 | hash_foreach_pair (p, jm->sw_if_index_by_interface_name, |
| 487 | ({ |
| 488 | this_name = (const char *)(p->key); |
| 489 | if (strlen (nf) == 0 || strcasestr (this_name, nf)) { |
| 490 | vec_add2 (nses, ns, 1); |
| 491 | ns->name = (u8 *)(p->key); |
| 492 | ns->value = (u32) p->value[0]; |
| 493 | } |
| 494 | })); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 495 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 496 | vec_sort_with_function (nses, name_sort_cmp); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 497 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 498 | vec_foreach (ns, nses) |
| 499 | s = format (s, "%s: %d, ", ns->name, ns->value); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 500 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 501 | _vec_len (s) = vec_len (s) - 2; |
| 502 | vec_terminate_c_string (s); |
| 503 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 504 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 505 | vec_free (nses); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 506 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 507 | (*env)->ReleaseStringUTFChars (env, name_filter, nf); |
| 508 | |
| 509 | rv = (*env)->NewStringUTF (env, (char *) s); |
| 510 | vec_free (s); |
| 511 | |
| 512 | return rv; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 513 | } |
| 514 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 515 | JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_swIfIndexFromName0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 516 | (JNIEnv * env, jobject obj, jstring interfaceName) |
| 517 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 518 | vppjni_main_t * jm = &vppjni_main; |
| 519 | jint rv = -1; |
| 520 | const char * if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL); |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 521 | if (if_name) { |
| 522 | uword * p; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 523 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 524 | vppjni_lock (jm, 5); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 525 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 526 | p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 527 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 528 | if (p != 0) |
| 529 | rv = (jint) p[0]; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 530 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 531 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 532 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 533 | (*env)->ReleaseStringUTFChars (env, interfaceName, if_name); |
| 534 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 535 | |
| 536 | return rv; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 537 | } |
| 538 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 539 | JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceCounters0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 540 | (JNIEnv * env, jobject obj, jint swIfIndex) |
| 541 | { |
| 542 | vppjni_main_t * jm = &vppjni_main; |
| 543 | sw_interface_stats_t *s; |
| 544 | u32 sw_if_index = swIfIndex; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 545 | jobject result = NULL; |
| 546 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 547 | vppjni_lock (jm, 16); |
| 548 | |
| 549 | if (sw_if_index >= vec_len(jm->sw_if_stats_by_sw_if_index)) { |
| 550 | goto out; |
| 551 | } |
| 552 | s = &jm->sw_if_stats_by_sw_if_index[sw_if_index]; |
| 553 | if (!s->valid) { |
| 554 | goto out; |
| 555 | } |
| 556 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 557 | result = vppInterfaceCountersObject(env, |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 558 | s->rx.octets, s->rx.pkts.ip4, s->rx.pkts.ip6, s->rx.pkts.unicast, |
| 559 | s->rx.pkts.multicast, s->rx.pkts.broadcast, s->rx.pkts.discard, |
| 560 | s->rx.pkts.fifo_full, s->rx.pkts.error, s->rx.pkts.unknown_proto, |
| 561 | s->rx.pkts.miss, |
| 562 | s->tx.octets, s->tx.pkts.ip4, s->tx.pkts.ip6, s->tx.pkts.unicast, |
| 563 | s->tx.pkts.multicast, s->tx.pkts.broadcast, s->tx.pkts.discard, |
| 564 | s->tx.pkts.fifo_full, s->tx.pkts.error, s->tx.pkts.unknown_proto, |
| 565 | s->tx.pkts.miss); |
| 566 | |
| 567 | out: |
| 568 | vppjni_unlock (jm); |
| 569 | return result; |
| 570 | } |
| 571 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 572 | JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_interfaceNameFromSwIfIndex0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 573 | (JNIEnv * env, jobject obj, jint swIfIndex) |
| 574 | { |
| 575 | vppjni_main_t * jm = &vppjni_main; |
| 576 | sw_interface_details_t *sw_if_details; |
| 577 | u32 sw_if_index; |
| 578 | jstring ifname = NULL; |
| 579 | |
| 580 | vppjni_lock (jm, 8); |
| 581 | |
| 582 | sw_if_index = swIfIndex; |
| 583 | |
| 584 | if (sw_if_index >= vec_len(jm->sw_if_table)) { |
| 585 | goto out; |
| 586 | } |
| 587 | sw_if_details = &jm->sw_if_table[sw_if_index]; |
| 588 | if (!sw_if_details->valid) { |
| 589 | goto out; |
| 590 | } |
| 591 | |
| 592 | u8 * s = format (0, "%s%c", sw_if_details->interface_name, 0); |
| 593 | ifname = (*env)->NewStringUTF(env, (char *)s); |
| 594 | |
| 595 | out: |
| 596 | vppjni_unlock (jm); |
| 597 | |
| 598 | return ifname; |
| 599 | } |
| 600 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 601 | JNIEXPORT void JNICALL Java_org_openvpp_vppjapi_vppConn_clearInterfaceTable0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 602 | (JNIEnv * env, jobject obj) |
| 603 | { |
| 604 | vppjni_main_t * jm = &vppjni_main; |
| 605 | |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 606 | vppjni_lock (jm, 21); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 607 | |
| 608 | vec_reset_length(jm->sw_if_table); |
| 609 | |
| 610 | vppjni_unlock (jm); |
| 611 | } |
| 612 | |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 613 | static jobjectArray sw_if_dump_get_interfaces (); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 614 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 615 | JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_swInterfaceDump0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 616 | (JNIEnv * env, jobject obj, jbyte name_filter_valid, jbyteArray name_filter) |
| 617 | { |
| 618 | vppjni_main_t *jm = &vppjni_main; |
| 619 | f64 timeout; |
| 620 | vl_api_sw_interface_dump_t * mp; |
| 621 | u32 my_context_id; |
| 622 | int rv; |
| 623 | rv = vppjni_sanity_check (jm); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 624 | if (rv) { |
| 625 | clib_warning("swInterfaceDump sanity_check rv = %d", rv); |
| 626 | return NULL; |
| 627 | } |
| 628 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 629 | vppjni_lock (jm, 7); |
| 630 | my_context_id = vppjni_get_context_id (jm); |
Robert Varga | 427ce22 | 2016-02-01 18:12:18 +0100 | [diff] [blame] | 631 | jsize cnt = (*env)->GetArrayLength (env, name_filter); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 632 | |
| 633 | M(SW_INTERFACE_DUMP, sw_interface_dump); |
| 634 | mp->context = clib_host_to_net_u32 (my_context_id); |
| 635 | mp->name_filter_valid = name_filter_valid; |
| 636 | |
| 637 | if (cnt > sizeof(mp->name_filter)) |
| 638 | cnt = sizeof(mp->name_filter); |
| 639 | |
Robert Varga | 427ce22 | 2016-02-01 18:12:18 +0100 | [diff] [blame] | 640 | (*env)->GetByteArrayRegion(env, name_filter, 0, cnt, (jbyte *)mp->name_filter); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 641 | |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 642 | DEBUG_LOG ("interface filter (%d, %s, len: %d)", mp->name_filter_valid, (char *)mp->name_filter, cnt); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 643 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 644 | jm->collect_indices = 1; |
| 645 | |
| 646 | S; |
| 647 | { |
| 648 | // now send control ping so we know when it ends |
| 649 | vl_api_control_ping_t * mp; |
| 650 | M(CONTROL_PING, control_ping); |
| 651 | mp->context = clib_host_to_net_u32 (my_context_id); |
| 652 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 653 | S; |
| 654 | } |
| 655 | vppjni_unlock (jm); |
| 656 | WNR; |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 657 | |
| 658 | vppjni_lock (jm, 7); |
| 659 | jobjectArray result = sw_if_dump_get_interfaces(env); |
| 660 | vppjni_unlock (jm); |
| 661 | return result; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 662 | } |
| 663 | |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 664 | static jobjectArray sw_if_dump_get_interfaces (JNIEnv * env) |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 665 | { |
| 666 | vppjni_main_t * jm = &vppjni_main; |
| 667 | sw_interface_details_t *sw_if_details; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 668 | u32 i; |
| 669 | |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 670 | int len = vec_len(jm->sw_if_dump_if_indices); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 671 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 672 | jobjectArray ifArray = vppInterfaceDetailsArray(env, len); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 673 | |
| 674 | for (i = 0; i < len; i++) { |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 675 | u32 sw_if_index = jm->sw_if_dump_if_indices[i]; |
| 676 | ASSERT(sw_if_index < vec_len(jm->sw_if_table)); |
| 677 | sw_if_details = &jm->sw_if_table[sw_if_index]; |
| 678 | ASSERT(sw_if_details->valid); |
| 679 | |
| 680 | u8 * s = format (0, "%s%c", sw_if_details->interface_name, 0); |
| 681 | |
| 682 | jstring ifname = (*env)->NewStringUTF(env, (char *)s); |
| 683 | jint ifIndex = sw_if_details->sw_if_index; |
| 684 | jint supIfIndex = sw_if_details->sup_sw_if_index; |
| 685 | jbyteArray physAddr = (*env)->NewByteArray(env, |
| 686 | sw_if_details->l2_address_length); |
| 687 | (*env)->SetByteArrayRegion(env, physAddr, 0, |
| 688 | sw_if_details->l2_address_length, |
| 689 | (signed char*)sw_if_details->l2_address); |
| 690 | jint subId = sw_if_details->sub_id; |
| 691 | jint subOuterVlanId = sw_if_details->sub_outer_vlan_id; |
| 692 | jint subInnerVlanId = sw_if_details->sub_inner_vlan_id; |
| 693 | jint vtrOp = sw_if_details->vtr_op; |
| 694 | jint vtrPushDot1q = sw_if_details->vtr_push_dot1q; |
| 695 | jint vtrTag1 = sw_if_details->vtr_tag1; |
| 696 | jint vtrTag2 = sw_if_details->vtr_tag2; |
Pavel | 84e4ffe | 2016-02-17 15:10:04 +0100 | [diff] [blame^] | 697 | jint linkMtu = sw_if_details->link_mtu; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 698 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 699 | jbyte adminUpDown = sw_if_details->admin_up_down; |
| 700 | jbyte linkUpDown = sw_if_details->link_up_down; |
| 701 | jbyte linkDuplex = sw_if_details->link_duplex; |
| 702 | jbyte linkSpeed = sw_if_details->link_speed; |
| 703 | jbyte subDot1ad = sw_if_details->sub_dot1ad; |
| 704 | jbyte subNumberOfTags = sw_if_details->sub_number_of_tags; |
| 705 | jbyte subExactMatch = sw_if_details->sub_exact_match; |
| 706 | jbyte subDefault = sw_if_details->sub_default; |
| 707 | jbyte subOuterVlanIdAny = sw_if_details->sub_outer_vlan_id_any; |
| 708 | jbyte subInnerVlanIdAny = sw_if_details->sub_inner_vlan_id_any; |
| 709 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 710 | jobject ifObj = vppInterfaceDetailsObject(env, |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 711 | ifIndex, ifname, |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 712 | supIfIndex, physAddr, adminUpDown, linkUpDown, |
| 713 | linkDuplex, linkSpeed, subId, subDot1ad, |
| 714 | subNumberOfTags, subOuterVlanId, subInnerVlanId, |
| 715 | subExactMatch, subDefault, subOuterVlanIdAny, |
Pavel | 84e4ffe | 2016-02-17 15:10:04 +0100 | [diff] [blame^] | 716 | subInnerVlanIdAny, vtrOp, vtrPushDot1q, vtrTag1, vtrTag2, linkMtu); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 717 | (*env)->SetObjectArrayElement(env, ifArray, i, ifObj); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 718 | } |
| 719 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 720 | jm->collect_indices = 0; |
| 721 | vec_reset_length(jm->sw_if_dump_if_indices); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 722 | return ifArray; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 723 | } |
| 724 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 725 | JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_findOrAddBridgeDomainId0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 726 | (JNIEnv * env, jobject obj, jstring bridgeDomain) |
| 727 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 728 | vppjni_main_t * jm = &vppjni_main; |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 729 | jint rv = -1; |
| 730 | const char * bdName = (*env)->GetStringUTFChars (env, bridgeDomain, NULL); |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 731 | if (bdName) { |
| 732 | static u8 * bd_name = 0; |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 733 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 734 | vec_validate_init_c_string (bd_name, bdName, strlen(bdName)); |
| 735 | (*env)->ReleaseStringUTFChars (env, bridgeDomain, bdName); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 736 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 737 | vppjni_lock (jm, 6); |
| 738 | rv = (jint)vjbd_find_or_add_bd (&jm->vjbd_main, bd_name); |
| 739 | vppjni_unlock (jm); |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 740 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 741 | _vec_len(bd_name) = 0; |
| 742 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 743 | return rv; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 744 | } |
| 745 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 746 | JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainIdFromName0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 747 | (JNIEnv * env, jobject obj, jstring bridgeDomain) |
| 748 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 749 | vppjni_main_t * jm = &vppjni_main; |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 750 | jint rv = -1; |
| 751 | const char * bdName = (*env)->GetStringUTFChars (env, bridgeDomain, NULL); |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 752 | if (bdName) { |
| 753 | static u8 * bd_name = 0; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 754 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 755 | vec_validate_init_c_string (bd_name, bdName, strlen(bdName)); |
| 756 | (*env)->ReleaseStringUTFChars (env, bridgeDomain, bdName); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 757 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 758 | vppjni_lock (jm, 20); |
| 759 | rv = (jint)vjbd_id_from_name(&jm->vjbd_main, (u8 *)bd_name); |
| 760 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 761 | |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 762 | _vec_len(bd_name) = 0; |
| 763 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 764 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 765 | return rv; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 766 | } |
| 767 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 768 | JNIEXPORT jint JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainIdFromInterfaceName0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 769 | (JNIEnv * env, jobject obj, jstring interfaceName) |
| 770 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 771 | vppjni_main_t * jm = &vppjni_main; |
| 772 | vjbd_main_t * bdm = &jm->vjbd_main; |
| 773 | u32 sw_if_index; |
| 774 | jint rv = -1; |
| 775 | const char * if_name; |
| 776 | uword * p; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 777 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 778 | if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 779 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 780 | vppjni_lock (jm, 14); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 781 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 782 | p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 783 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 784 | if (p != 0) { |
| 785 | sw_if_index = (jint) p[0]; |
| 786 | p = hash_get (bdm->bd_id_by_sw_if_index, sw_if_index); |
| 787 | if (p != 0) { |
| 788 | rv = (jint) p[0]; |
| 789 | } |
| 790 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 791 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 792 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 793 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 794 | (*env)->ReleaseStringUTFChars (env, interfaceName, if_name); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 795 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 796 | return rv; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 797 | } |
| 798 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 799 | /* |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 800 | * Special-case: build the interface table, maintain |
| 801 | * the next loopback sw_if_index vbl. |
| 802 | */ |
| 803 | static void vl_api_sw_interface_details_t_handler |
| 804 | (vl_api_sw_interface_details_t * mp) |
| 805 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 806 | vppjni_main_t * jm = &vppjni_main; |
| 807 | static sw_interface_details_t empty_sw_if_details = {0,}; |
| 808 | sw_interface_details_t *sw_if_details; |
| 809 | u32 sw_if_index; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 810 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 811 | vppjni_lock (jm, 1); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 812 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 813 | sw_if_index = ntohl (mp->sw_if_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 814 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 815 | u8 * s = format (0, "%s%c", mp->interface_name, 0); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 816 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 817 | if (jm->collect_indices) { |
| 818 | u32 pos = vec_len(jm->sw_if_dump_if_indices); |
| 819 | vec_validate(jm->sw_if_dump_if_indices, pos); |
| 820 | jm->sw_if_dump_if_indices[pos] = sw_if_index; |
| 821 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 822 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 823 | vec_validate_init_empty(jm->sw_if_table, sw_if_index, empty_sw_if_details); |
| 824 | sw_if_details = &jm->sw_if_table[sw_if_index]; |
| 825 | sw_if_details->valid = 1; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 826 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 827 | snprintf((char *)sw_if_details->interface_name, |
| 828 | sizeof(sw_if_details->interface_name), "%s", (char *)s); |
| 829 | sw_if_details->sw_if_index = sw_if_index; |
| 830 | sw_if_details->sup_sw_if_index = ntohl(mp->sup_sw_if_index); |
| 831 | sw_if_details->l2_address_length = ntohl (mp->l2_address_length); |
| 832 | ASSERT(sw_if_details->l2_address_length <= sizeof(sw_if_details->l2_address)); |
| 833 | memcpy(sw_if_details->l2_address, mp->l2_address, |
| 834 | sw_if_details->l2_address_length); |
| 835 | sw_if_details->sub_id = ntohl (mp->sub_id); |
| 836 | sw_if_details->sub_outer_vlan_id = ntohl (mp->sub_outer_vlan_id); |
| 837 | sw_if_details->sub_inner_vlan_id = ntohl (mp->sub_inner_vlan_id); |
| 838 | sw_if_details->vtr_op = ntohl (mp->vtr_op); |
| 839 | sw_if_details->vtr_push_dot1q = ntohl (mp->vtr_push_dot1q); |
| 840 | sw_if_details->vtr_tag1 = ntohl (mp->vtr_tag1); |
| 841 | sw_if_details->vtr_tag2 = ntohl (mp->vtr_tag2); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 842 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 843 | sw_if_details->admin_up_down = mp->admin_up_down; |
| 844 | sw_if_details->link_up_down = mp->link_up_down; |
| 845 | sw_if_details->link_duplex = mp->link_duplex; |
| 846 | sw_if_details->link_speed = mp->link_speed; |
| 847 | sw_if_details->sub_dot1ad = mp->sub_dot1ad; |
| 848 | sw_if_details->sub_number_of_tags = mp->sub_number_of_tags; |
| 849 | sw_if_details->sub_exact_match = mp->sub_exact_match; |
| 850 | sw_if_details->sub_default = mp->sub_default; |
| 851 | sw_if_details->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any; |
| 852 | sw_if_details->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 853 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 854 | hash_set_mem (jm->sw_if_index_by_interface_name, s, sw_if_index); |
| 855 | DEBUG_LOG ("Got interface %s", (char *)s); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 856 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 857 | /* In sub interface case, fill the sub interface table entry */ |
| 858 | if (mp->sw_if_index != mp->sup_sw_if_index) { |
| 859 | sw_interface_subif_t * sub = NULL; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 860 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 861 | vec_add2(jm->sw_if_subif_table, sub, 1); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 862 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 863 | vec_validate(sub->interface_name, strlen((char *)s) + 1); |
| 864 | strncpy((char *)sub->interface_name, (char *)s, |
| 865 | vec_len(sub->interface_name)); |
| 866 | sub->sw_if_index = ntohl(mp->sw_if_index); |
| 867 | sub->sub_id = ntohl(mp->sub_id); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 868 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 869 | sub->sub_dot1ad = mp->sub_dot1ad; |
| 870 | sub->sub_number_of_tags = mp->sub_number_of_tags; |
| 871 | sub->sub_outer_vlan_id = ntohs(mp->sub_outer_vlan_id); |
| 872 | sub->sub_inner_vlan_id = ntohs(mp->sub_inner_vlan_id); |
| 873 | sub->sub_exact_match = mp->sub_exact_match; |
| 874 | sub->sub_default = mp->sub_default; |
| 875 | sub->sub_outer_vlan_id_any = mp->sub_outer_vlan_id_any; |
| 876 | sub->sub_inner_vlan_id_any = mp->sub_inner_vlan_id_any; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 877 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 878 | /* vlan tag rewrite */ |
| 879 | sub->vtr_op = ntohl(mp->vtr_op); |
| 880 | sub->vtr_push_dot1q = ntohl(mp->vtr_push_dot1q); |
| 881 | sub->vtr_tag1 = ntohl(mp->vtr_tag1); |
| 882 | sub->vtr_tag2 = ntohl(mp->vtr_tag2); |
| 883 | } |
| 884 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 885 | } |
| 886 | |
| 887 | static void vl_api_sw_interface_set_flags_t_handler |
| 888 | (vl_api_sw_interface_set_flags_t * mp) |
| 889 | { |
| 890 | /* $$$ nothing for the moment */ |
| 891 | } |
| 892 | |
| 893 | static jintArray create_array_of_bd_ids(JNIEnv * env, jint bd_id) |
| 894 | { |
| 895 | vppjni_main_t *jm = &vppjni_main; |
| 896 | vjbd_main_t * bdm = &jm->vjbd_main; |
| 897 | u32 *buf = NULL; |
| 898 | u32 i; |
| 899 | |
| 900 | if (bd_id != ~0) { |
| 901 | vec_add1(buf, bd_id); |
| 902 | } else { |
| 903 | for (i = 0; i < vec_len(bdm->bd_oper); i++) { |
| 904 | u32 bd_id = bdm->bd_oper[i].bd_id; |
| 905 | vec_add1(buf, bd_id); |
| 906 | } |
| 907 | } |
| 908 | |
| 909 | jintArray bdidArray = (*env)->NewIntArray(env, vec_len(buf)); |
Robert Varga | ec3034c | 2016-02-10 16:00:16 +0100 | [diff] [blame] | 910 | if (!bdidArray) { |
| 911 | goto out; |
| 912 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 913 | |
| 914 | (*env)->SetIntArrayRegion(env, bdidArray, 0, vec_len(buf), (int*)buf); |
| 915 | |
Robert Varga | ec3034c | 2016-02-10 16:00:16 +0100 | [diff] [blame] | 916 | out: |
Robert Varga | 7a224a0 | 2016-02-01 18:33:38 +0100 | [diff] [blame] | 917 | vec_free(buf); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 918 | return bdidArray; |
| 919 | } |
| 920 | |
| 921 | static void bridge_domain_oper_free(void) |
| 922 | { |
| 923 | vppjni_main_t *jm = &vppjni_main; |
| 924 | vjbd_main_t *bdm = &jm->vjbd_main; |
| 925 | u32 i; |
| 926 | |
| 927 | for (i = 0; i < vec_len(bdm->bd_oper); i++) { |
| 928 | vec_free(bdm->bd_oper->l2fib_oper); |
| 929 | } |
| 930 | vec_reset_length(bdm->bd_oper); |
| 931 | hash_free(bdm->bd_id_by_sw_if_index); |
| 932 | hash_free(bdm->oper_bd_index_by_bd_id); |
| 933 | } |
| 934 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 935 | JNIEXPORT jintArray JNICALL Java_org_openvpp_vppjapi_vppConn_bridgeDomainDump0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 936 | (JNIEnv * env, jobject obj, jint bd_id) |
| 937 | { |
| 938 | vppjni_main_t *jm = &vppjni_main; |
| 939 | vl_api_bridge_domain_dump_t * mp; |
| 940 | u32 my_context_id; |
| 941 | f64 timeout; |
| 942 | int rv; |
| 943 | rv = vppjni_sanity_check (jm); |
| 944 | if (rv) return NULL; |
| 945 | |
| 946 | vppjni_lock (jm, 15); |
| 947 | |
| 948 | if (~0 == bd_id) { |
| 949 | bridge_domain_oper_free(); |
| 950 | } |
| 951 | |
| 952 | my_context_id = vppjni_get_context_id (jm); |
| 953 | M(BRIDGE_DOMAIN_DUMP, bridge_domain_dump); |
| 954 | mp->context = clib_host_to_net_u32 (my_context_id); |
| 955 | mp->bd_id = clib_host_to_net_u32(bd_id); |
| 956 | S; |
| 957 | |
| 958 | /* Use a control ping for synchronization */ |
| 959 | { |
| 960 | vl_api_control_ping_t * mp; |
| 961 | M(CONTROL_PING, control_ping); |
| 962 | S; |
| 963 | } |
| 964 | |
| 965 | WNR; |
| 966 | if (0 != rv) { |
| 967 | return NULL; |
| 968 | } |
| 969 | |
| 970 | jintArray ret = create_array_of_bd_ids(env, bd_id); |
| 971 | |
| 972 | vppjni_unlock (jm); |
| 973 | |
| 974 | return ret; |
| 975 | } |
| 976 | |
| 977 | static void |
| 978 | vl_api_bridge_domain_details_t_handler (vl_api_bridge_domain_details_t * mp) |
| 979 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 980 | vppjni_main_t *jm = &vppjni_main; |
| 981 | vjbd_main_t * bdm = &jm->vjbd_main; |
| 982 | vjbd_oper_t * bd_oper; |
| 983 | u32 bd_id, bd_index; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 984 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 985 | bd_id = ntohl (mp->bd_id); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 986 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 987 | bd_index = vec_len(bdm->bd_oper); |
| 988 | vec_validate (bdm->bd_oper, bd_index); |
| 989 | bd_oper = vec_elt_at_index(bdm->bd_oper, bd_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 990 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 991 | hash_set(bdm->oper_bd_index_by_bd_id, bd_id, bd_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 992 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 993 | bd_oper->bd_id = bd_id; |
| 994 | bd_oper->flood = mp->flood != 0; |
| 995 | bd_oper->forward = mp->forward != 0; |
| 996 | bd_oper->learn = mp->learn != 0; |
| 997 | bd_oper->uu_flood = mp->uu_flood != 0; |
| 998 | bd_oper->arp_term = mp->arp_term != 0; |
| 999 | bd_oper->bvi_sw_if_index = ntohl (mp->bvi_sw_if_index); |
| 1000 | bd_oper->n_sw_ifs = ntohl (mp->n_sw_ifs); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1001 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1002 | bd_oper->bd_sw_if_oper = 0; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1003 | } |
| 1004 | |
| 1005 | static void |
| 1006 | vl_api_bridge_domain_sw_if_details_t_handler |
| 1007 | (vl_api_bridge_domain_sw_if_details_t * mp) |
| 1008 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1009 | vppjni_main_t *jm = &vppjni_main; |
| 1010 | vjbd_main_t * bdm = &jm->vjbd_main; |
| 1011 | bd_sw_if_oper_t * bd_sw_if_oper; |
| 1012 | u32 bd_id, sw_if_index; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1013 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1014 | bd_id = ntohl (mp->bd_id); |
| 1015 | sw_if_index = ntohl (mp->sw_if_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1016 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1017 | uword *p; |
| 1018 | p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id); |
| 1019 | if (p == 0) { |
| 1020 | clib_warning("Invalid bd_id %d in bridge_domain_sw_if_details_t_handler", bd_id); |
| 1021 | return; |
| 1022 | } |
| 1023 | u32 oper_bd_index = (jint) p[0]; |
| 1024 | vjbd_oper_t *bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1025 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1026 | u32 len = vec_len(bd_oper->bd_sw_if_oper); |
| 1027 | vec_validate(bd_oper->bd_sw_if_oper, len); |
| 1028 | bd_sw_if_oper = &bd_oper->bd_sw_if_oper[len]; |
| 1029 | bd_sw_if_oper->bd_id = bd_id; |
| 1030 | bd_sw_if_oper->sw_if_index = sw_if_index; |
| 1031 | bd_sw_if_oper->shg = mp->shg; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1032 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1033 | hash_set(bdm->bd_id_by_sw_if_index, sw_if_index, bd_id); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1034 | } |
| 1035 | |
| 1036 | static const char* interface_name_from_sw_if_index(u32 sw_if_index) |
| 1037 | { |
| 1038 | vppjni_main_t *jm = &vppjni_main; |
| 1039 | |
| 1040 | if (sw_if_index >= vec_len(jm->sw_if_table)) { |
| 1041 | return NULL; |
| 1042 | } |
| 1043 | if (!jm->sw_if_table[sw_if_index].valid) { |
| 1044 | return NULL; |
| 1045 | } |
| 1046 | return (const char*)jm->sw_if_table[sw_if_index].interface_name; |
| 1047 | } |
| 1048 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 1049 | JNIEXPORT jobject JNICALL Java_org_openvpp_vppjapi_vppConn_getBridgeDomainDetails0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1050 | (JNIEnv * env, jobject obj, jint bdId) |
| 1051 | { |
| 1052 | vppjni_main_t *jm = &vppjni_main; |
| 1053 | vjbd_main_t * bdm = &jm->vjbd_main; |
| 1054 | u32 oper_bd_index; |
| 1055 | u32 bd_id = bdId; |
| 1056 | jobject rv = NULL; |
| 1057 | uword *p; |
| 1058 | |
| 1059 | vppjni_lock (jm, 16); |
| 1060 | |
| 1061 | p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id); |
| 1062 | if (p == 0) { |
| 1063 | rv = NULL; |
| 1064 | goto out; |
| 1065 | } |
| 1066 | oper_bd_index = (jint) p[0]; |
| 1067 | |
| 1068 | vjbd_oper_t *bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index); |
| 1069 | |
| 1070 | |
| 1071 | /* setting BridgeDomainDetails */ |
| 1072 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1073 | jobject bddObj = vppBridgeDomainDetailsObject(env); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1074 | |
| 1075 | u8 *vec_bd_name = vjbd_oper_name_from_id(bdm, bd_id); |
| 1076 | if (NULL == vec_bd_name) { |
| 1077 | rv = NULL; |
| 1078 | goto out; |
| 1079 | } |
| 1080 | char *str_bd_name = (char*)format (0, "%s%c", vec_bd_name, 0); |
| 1081 | vec_free(vec_bd_name); |
| 1082 | jstring bdName = (*env)->NewStringUTF(env, str_bd_name); |
| 1083 | vec_free(str_bd_name); |
| 1084 | if (NULL == bdName) { |
| 1085 | rv = NULL; |
| 1086 | goto out; |
| 1087 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1088 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1089 | set_vppBridgeDomainDetails_name(env, bddObj, bdName); |
| 1090 | set_vppBridgeDomainDetails_bdId(env, bddObj, bdId); |
| 1091 | set_vppBridgeDomainDetails_flood(env, bddObj, (jboolean)bd_oper->flood); |
| 1092 | set_vppBridgeDomainDetails_uuFlood(env, bddObj, (jboolean)bd_oper->uu_flood); |
| 1093 | set_vppBridgeDomainDetails_forward(env, bddObj, (jboolean)bd_oper->forward); |
| 1094 | set_vppBridgeDomainDetails_learn(env, bddObj, (jboolean)bd_oper->learn); |
| 1095 | set_vppBridgeDomainDetails_arpTerm(env, bddObj, (jboolean)bd_oper->arp_term); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1096 | |
| 1097 | jstring bviInterfaceName = NULL; |
| 1098 | if (~0 != bd_oper->bvi_sw_if_index) { |
| 1099 | const char *str_if_name = interface_name_from_sw_if_index(bd_oper->bvi_sw_if_index); |
| 1100 | if (NULL == str_if_name) { |
| 1101 | clib_warning("Could not get interface name for sw_if_index %d", bd_oper->bvi_sw_if_index); |
| 1102 | rv = NULL; |
| 1103 | goto out; |
| 1104 | } |
| 1105 | bviInterfaceName = (*env)->NewStringUTF(env, str_if_name); |
| 1106 | if (NULL == bviInterfaceName) { |
| 1107 | rv = NULL; |
| 1108 | goto out; |
| 1109 | } |
| 1110 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1111 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1112 | set_vppBridgeDomainDetails_bviInterfaceName(env, bddObj, bviInterfaceName); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1113 | |
| 1114 | /* setting BridgeDomainInterfaceDetails */ |
| 1115 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1116 | u32 len = vec_len(bd_oper->bd_sw_if_oper); |
| 1117 | ASSERT(len == bd_oper->n_sw_ifs); |
| 1118 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1119 | jobjectArray bdidArray = vppBridgeDomainInterfaceDetailsArray(env, len); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1120 | |
| 1121 | u32 i; |
| 1122 | for (i = 0; i < len; i++) { |
| 1123 | bd_sw_if_oper_t *sw_if_oper = &bd_oper->bd_sw_if_oper[i]; |
| 1124 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1125 | jobject bdidObj = vppBridgeDomainInterfaceDetailsObject(env); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1126 | (*env)->SetObjectArrayElement(env, bdidArray, i, bdidObj); |
| 1127 | |
| 1128 | u32 sw_if_index = sw_if_oper->sw_if_index; |
| 1129 | const char *str_if_name = interface_name_from_sw_if_index(sw_if_index); |
| 1130 | if (NULL == str_if_name) { |
| 1131 | rv = NULL; |
| 1132 | goto out; |
| 1133 | } |
| 1134 | jstring interfaceName = (*env)->NewStringUTF(env, str_if_name); |
| 1135 | if (NULL == interfaceName) { |
| 1136 | rv = NULL; |
| 1137 | goto out; |
| 1138 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1139 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1140 | set_vppBridgeDomainInterfaceDetails_interfaceName(env, bdidObj, interfaceName); |
| 1141 | set_vppBridgeDomainInterfaceDetails_splitHorizonGroup(env, bdidObj, (jbyte)sw_if_oper->shg); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1142 | } |
| 1143 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1144 | set_vppBridgeDomainDetails_interfaces(env, bddObj, bdidArray); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1145 | |
| 1146 | rv = bddObj; |
| 1147 | |
| 1148 | out: |
| 1149 | |
| 1150 | vppjni_unlock (jm); |
| 1151 | |
| 1152 | return rv; |
| 1153 | } |
| 1154 | |
| 1155 | static jobject l2_fib_create_object(JNIEnv *env, bd_l2fib_oper_t *l2_fib) |
| 1156 | { |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1157 | u32 sw_if_index = l2_fib->sw_if_index; |
| 1158 | const char *str_if_name = interface_name_from_sw_if_index(sw_if_index); |
| 1159 | if (NULL == str_if_name) { |
| 1160 | return NULL; |
| 1161 | } |
| 1162 | jstring interfaceName = (*env)->NewStringUTF(env, str_if_name); |
| 1163 | if (NULL == interfaceName) { |
| 1164 | return NULL; |
| 1165 | } |
| 1166 | |
| 1167 | jbyteArray physAddr = (*env)->NewByteArray(env, 6); |
| 1168 | (*env)->SetByteArrayRegion(env, physAddr, 0, 6, |
| 1169 | (signed char*)l2_fib->mac_addr.fields.mac); |
| 1170 | jboolean staticConfig = !l2_fib->learned; |
| 1171 | jstring outgoingInterface = interfaceName; |
| 1172 | jboolean filter = l2_fib->filter; |
| 1173 | jboolean bridgedVirtualInterface = l2_fib->bvi; |
| 1174 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1175 | return vppL2FibObject(env, physAddr, staticConfig, outgoingInterface, filter, bridgedVirtualInterface); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1176 | } |
| 1177 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 1178 | JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_l2FibTableDump0 |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1179 | (JNIEnv * env, jobject obj, jint bd_id) |
| 1180 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1181 | vppjni_main_t *jm = &vppjni_main; |
| 1182 | vjbd_main_t * bdm = &jm->vjbd_main; |
| 1183 | vl_api_l2_fib_table_dump_t *mp; |
| 1184 | jobjectArray l2FibArray = NULL; |
| 1185 | vjbd_oper_t *bd_oper; |
| 1186 | u32 oper_bd_index; |
| 1187 | uword *p; |
| 1188 | f64 timeout; |
| 1189 | int rv; |
| 1190 | u32 i; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1191 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1192 | vppjni_lock (jm, 17); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1193 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1194 | //vjbd_l2fib_oper_reset (bdm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1195 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1196 | p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id); |
| 1197 | if (p == 0) { |
| 1198 | goto done; |
| 1199 | } |
| 1200 | oper_bd_index = p[0]; |
| 1201 | bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index); |
| 1202 | vec_reset_length (bd_oper->l2fib_oper); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1203 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1204 | /* Get list of l2 fib table entries */ |
| 1205 | M(L2_FIB_TABLE_DUMP, l2_fib_table_dump); |
| 1206 | mp->bd_id = ntohl(bd_id); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1207 | S; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1208 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1209 | /* Use a control ping for synchronization */ |
| 1210 | { |
| 1211 | vl_api_control_ping_t * mp; |
| 1212 | M(CONTROL_PING, control_ping); |
| 1213 | S; |
| 1214 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1215 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1216 | WNR; |
| 1217 | if (0 != rv) { |
| 1218 | goto done; |
| 1219 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1220 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1221 | u32 count = vec_len(bd_oper->l2fib_oper); |
| 1222 | bd_l2fib_oper_t *l2fib_oper = bd_oper->l2fib_oper; |
| 1223 | |
| 1224 | l2FibArray = vppL2FibArray(env, count); |
| 1225 | for (i = 0; i < count; i++) { |
| 1226 | bd_l2fib_oper_t *l2_fib = &l2fib_oper[i]; |
| 1227 | jobject l2FibObj = l2_fib_create_object(env, l2_fib); |
| 1228 | (*env)->SetObjectArrayElement(env, l2FibArray, i, l2FibObj); |
| 1229 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1230 | |
| 1231 | done: |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1232 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1233 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1234 | return l2FibArray; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1235 | } |
| 1236 | |
| 1237 | static void |
| 1238 | vl_api_l2_fib_table_entry_t_handler (vl_api_l2_fib_table_entry_t * mp) |
| 1239 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1240 | //static u8 * mac_addr; |
| 1241 | vppjni_main_t *jm = &vppjni_main; |
| 1242 | vjbd_main_t * bdm = &jm->vjbd_main; |
| 1243 | vjbd_oper_t * bd_oper; |
| 1244 | u32 bd_id, oper_bd_index; |
| 1245 | //uword mhash_val_l2fi; |
| 1246 | bd_l2fib_oper_t * l2fib_oper; |
| 1247 | l2fib_u64_mac_t * l2fe_u64_mac = (l2fib_u64_mac_t *)&mp->mac; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1248 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1249 | bd_id = ntohl (mp->bd_id); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1250 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1251 | uword *p = hash_get (bdm->oper_bd_index_by_bd_id, bd_id); |
| 1252 | if (p == 0) { |
| 1253 | return; |
| 1254 | } |
| 1255 | oper_bd_index = (jint) p[0]; |
| 1256 | bd_oper = vec_elt_at_index(bdm->bd_oper, oper_bd_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1257 | |
| 1258 | #if 0 |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1259 | vec_validate (mac_addr, MAC_ADDRESS_SIZE); |
| 1260 | memcpy (mac_addr, l2fe_u64_mac->fields.mac, MAC_ADDRESS_SIZE); |
| 1261 | mhash_val_l2fi = vec_len (bd_oper->l2fib_oper); |
| 1262 | if (mhash_elts (&bd_oper->l2fib_index_by_mac) == 0) |
| 1263 | mhash_init (&bd_oper->l2fib_index_by_mac, sizeof (u32), MAC_ADDRESS_SIZE); |
| 1264 | mhash_set_mem (&bd_oper->l2fib_index_by_mac, mac_addr, &mhash_val_l2fi, 0); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1265 | #endif |
| 1266 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1267 | vec_add2 (bd_oper->l2fib_oper, l2fib_oper, 1); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1268 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1269 | l2fib_oper->bd_id = bd_id; |
| 1270 | l2fib_oper->mac_addr.raw = l2fib_mac_to_u64 (l2fe_u64_mac->fields.mac); |
| 1271 | l2fib_oper->sw_if_index = ntohl (mp->sw_if_index); |
| 1272 | l2fib_oper->learned = !mp->static_mac; |
| 1273 | l2fib_oper->filter = mp->filter_mac; |
| 1274 | l2fib_oper->bvi = mp->bvi_mac; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1275 | } |
| 1276 | |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1277 | static int ipAddressDump |
| 1278 | (JNIEnv * env, jobject obj, jstring interfaceName, jboolean isIPv6) |
| 1279 | { |
| 1280 | vppjni_main_t *jm = &vppjni_main; |
| 1281 | vl_api_ip_address_dump_t * mp; |
| 1282 | const char *if_name; |
| 1283 | u32 my_context_id; |
| 1284 | u32 sw_if_index; |
| 1285 | f64 timeout; |
| 1286 | uword *p; |
| 1287 | int rv = 0; |
| 1288 | |
| 1289 | if (NULL == interfaceName) { |
| 1290 | return -1; |
| 1291 | } |
| 1292 | |
| 1293 | if_name = (*env)->GetStringUTFChars (env, interfaceName, NULL); |
Robert Varga | f0f54d8 | 2016-02-10 16:01:58 +0100 | [diff] [blame] | 1294 | if (!if_name) { |
| 1295 | return -1; |
| 1296 | } |
| 1297 | |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1298 | p = hash_get_mem (jm->sw_if_index_by_interface_name, if_name); |
| 1299 | (*env)->ReleaseStringUTFChars (env, interfaceName, if_name); |
| 1300 | if (p == 0) { |
| 1301 | return -1; |
| 1302 | } |
| 1303 | sw_if_index = (u32) p[0]; |
| 1304 | |
| 1305 | rv = vppjni_sanity_check (jm); |
| 1306 | if (0 != rv) { |
| 1307 | return rv; |
| 1308 | } |
| 1309 | |
| 1310 | my_context_id = vppjni_get_context_id (jm); |
| 1311 | M(IP_ADDRESS_DUMP, ip_address_dump); |
| 1312 | mp->context = clib_host_to_net_u32 (my_context_id); |
| 1313 | mp->sw_if_index = clib_host_to_net_u32(sw_if_index); |
| 1314 | mp->is_ipv6 = isIPv6; |
| 1315 | jm->is_ipv6 = isIPv6; |
| 1316 | S; |
| 1317 | |
| 1318 | /* Use a control ping for synchronization */ |
| 1319 | { |
| 1320 | vl_api_control_ping_t * mp; |
| 1321 | M(CONTROL_PING, control_ping); |
| 1322 | S; |
| 1323 | } |
| 1324 | |
| 1325 | WNR; |
| 1326 | |
| 1327 | return rv; |
| 1328 | } |
| 1329 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 1330 | JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_ipv4AddressDump0 |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1331 | (JNIEnv * env, jobject obj, jstring interfaceName) |
| 1332 | { |
| 1333 | vppjni_main_t *jm = &vppjni_main; |
| 1334 | jobject returnArray = NULL; |
| 1335 | int i; |
| 1336 | |
| 1337 | vppjni_lock (jm, 18); |
| 1338 | |
| 1339 | vec_reset_length(jm->ipv4_addresses); |
| 1340 | |
| 1341 | if (0 != ipAddressDump(env, obj, interfaceName, 0)) { |
| 1342 | goto done; |
| 1343 | } |
| 1344 | |
| 1345 | u32 count = vec_len(jm->ipv4_addresses); |
| 1346 | ipv4_address_t *ipv4_address = jm->ipv4_addresses; |
| 1347 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1348 | jobjectArray ipv4AddressArray = vppIPv4AddressArray(env, count); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1349 | |
| 1350 | for (i = 0; i < count; i++) { |
| 1351 | ipv4_address_t *address = &ipv4_address[i]; |
| 1352 | |
| 1353 | jint ip = address->ip; |
| 1354 | jbyte prefixLength = address->prefix_length; |
| 1355 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1356 | jobject ipv4AddressObj = vppIPv4AddressObject(env, ip, prefixLength); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1357 | |
| 1358 | (*env)->SetObjectArrayElement(env, ipv4AddressArray, i, ipv4AddressObj); |
| 1359 | } |
| 1360 | |
| 1361 | returnArray = ipv4AddressArray; |
| 1362 | |
| 1363 | done: |
| 1364 | vppjni_unlock (jm); |
| 1365 | return returnArray; |
| 1366 | } |
| 1367 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 1368 | JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_ipv6AddressDump0 |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1369 | (JNIEnv * env, jobject obj, jstring interfaceName) |
| 1370 | { |
| 1371 | vppjni_main_t *jm = &vppjni_main; |
| 1372 | jobject returnArray = NULL; |
| 1373 | int i; |
| 1374 | |
| 1375 | vppjni_lock (jm, 19); |
| 1376 | |
| 1377 | vec_reset_length(jm->ipv6_addresses); |
| 1378 | |
| 1379 | if (0 != ipAddressDump(env, obj, interfaceName, 1)) { |
| 1380 | goto done; |
| 1381 | } |
| 1382 | |
| 1383 | u32 count = vec_len(jm->ipv6_addresses); |
| 1384 | ipv6_address_t *ipv6_address = jm->ipv6_addresses; |
| 1385 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1386 | jobjectArray ipv6AddressArray = vppIPv6AddressArray(env, count); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1387 | |
| 1388 | for (i = 0; i < count; i++) { |
| 1389 | ipv6_address_t *address = &ipv6_address[i]; |
| 1390 | |
| 1391 | jbyteArray ip = (*env)->NewByteArray(env, 16); |
| 1392 | (*env)->SetByteArrayRegion(env, ip, 0, 16, |
| 1393 | (signed char*)address->ip); |
| 1394 | |
| 1395 | jbyte prefixLength = address->prefix_length; |
| 1396 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1397 | jobject ipv6AddressObj = vppIPv6AddressObject(env, ip, prefixLength); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1398 | |
| 1399 | (*env)->SetObjectArrayElement(env, ipv6AddressArray, i, ipv6AddressObj); |
| 1400 | } |
| 1401 | |
| 1402 | returnArray = ipv6AddressArray; |
| 1403 | |
| 1404 | done: |
| 1405 | vppjni_unlock (jm); |
| 1406 | return returnArray; |
| 1407 | } |
| 1408 | |
| 1409 | static void vl_api_ip_address_details_t_handler (vl_api_ip_address_details_t * mp) |
| 1410 | { |
| 1411 | vppjni_main_t * jm = &vppjni_main; |
| 1412 | |
| 1413 | if (!jm->is_ipv6) { |
| 1414 | ipv4_address_t *address = 0; |
| 1415 | vec_add2(jm->ipv4_addresses, address, 1); |
Dave Wallace | 4afb281 | 2016-01-04 22:14:40 -0500 | [diff] [blame] | 1416 | memcpy(&address->ip, mp->ip, 4); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1417 | address->prefix_length = mp->prefix_length; |
| 1418 | } else { |
| 1419 | ipv6_address_t *address = 0; |
| 1420 | vec_add2(jm->ipv6_addresses, address, 1); |
| 1421 | memcpy(address->ip, mp->ip, 16); |
| 1422 | address->prefix_length = mp->prefix_length; |
| 1423 | } |
| 1424 | } |
| 1425 | |
| 1426 | #define VXLAN_TUNNEL_INTERFACE_NAME_PREFIX "vxlan_tunnel" |
| 1427 | |
Dave Wallace | ba474a2 | 2016-02-09 23:09:41 -0500 | [diff] [blame] | 1428 | JNIEXPORT jobjectArray JNICALL Java_org_openvpp_vppjapi_vppConn_vxlanTunnelDump0 |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1429 | (JNIEnv * env, jobject obj, jint swIfIndex) |
| 1430 | { |
| 1431 | vppjni_main_t *jm = &vppjni_main; |
| 1432 | vl_api_vxlan_tunnel_dump_t * mp; |
| 1433 | jobjectArray returnArray = NULL; |
| 1434 | u32 my_context_id; |
| 1435 | f64 timeout; |
| 1436 | int rv = 0; |
| 1437 | int i; |
| 1438 | |
| 1439 | vppjni_lock (jm, 22); |
| 1440 | |
| 1441 | vec_reset_length(jm->vxlan_tunnel_details); |
| 1442 | |
| 1443 | my_context_id = vppjni_get_context_id (jm); |
| 1444 | M(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump); |
| 1445 | mp->context = clib_host_to_net_u32 (my_context_id); |
| 1446 | mp->sw_if_index = clib_host_to_net_u32 (swIfIndex); |
| 1447 | S; |
| 1448 | |
| 1449 | /* Use a control ping for synchronization */ |
| 1450 | { |
| 1451 | vl_api_control_ping_t * mp; |
| 1452 | M(CONTROL_PING, control_ping); |
| 1453 | S; |
| 1454 | } |
| 1455 | |
| 1456 | WNR; |
| 1457 | if (0 != rv) { |
| 1458 | goto done; |
| 1459 | } |
| 1460 | |
| 1461 | u32 count = vec_len(jm->vxlan_tunnel_details); |
| 1462 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1463 | jobjectArray vxlanTunnelDetailsArray = vppVxlanTunnelDetailsArray(env, count); |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1464 | |
| 1465 | for (i = 0; i < count; i++) { |
| 1466 | vxlan_tunnel_details_t *details = &jm->vxlan_tunnel_details[i]; |
| 1467 | |
| 1468 | jint src_address = details->src_address; |
| 1469 | jint dst_address = details->dst_address; |
| 1470 | jint encap_vrf_id = details->encap_vrf_id; |
| 1471 | jint vni = details->vni; |
| 1472 | jint decap_next_index = details->decap_next_index; |
| 1473 | |
Robert Varga | 81d99ac | 2016-01-30 18:30:36 +0100 | [diff] [blame] | 1474 | jobject vxlanTunnelDetailsObj = vppVxlanTunnelDetailsObject(env, |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1475 | src_address, dst_address, encap_vrf_id, vni, decap_next_index); |
| 1476 | |
| 1477 | (*env)->SetObjectArrayElement(env, vxlanTunnelDetailsArray, i, |
| 1478 | vxlanTunnelDetailsObj); |
| 1479 | } |
| 1480 | |
| 1481 | returnArray = vxlanTunnelDetailsArray; |
| 1482 | |
| 1483 | done: |
| 1484 | vppjni_unlock (jm); |
| 1485 | return returnArray; |
| 1486 | } |
| 1487 | |
| 1488 | static void vl_api_vxlan_tunnel_details_t_handler |
| 1489 | (vl_api_vxlan_tunnel_details_t * mp) |
| 1490 | { |
| 1491 | vppjni_main_t * jm = &vppjni_main; |
| 1492 | vxlan_tunnel_details_t *tunnel_details; |
| 1493 | |
| 1494 | vec_add2(jm->vxlan_tunnel_details, tunnel_details, 1); |
| 1495 | tunnel_details->src_address = ntohl(mp->src_address); |
| 1496 | tunnel_details->dst_address = ntohl(mp->dst_address); |
| 1497 | tunnel_details->encap_vrf_id = ntohl(mp->encap_vrf_id); |
| 1498 | tunnel_details->vni = ntohl(mp->vni); |
| 1499 | tunnel_details->decap_next_index = ntohl(mp->decap_next_index); |
| 1500 | } |
| 1501 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1502 | /* cleanup handler for RX thread */ |
Robert Varga | 190efbc | 2016-02-09 17:16:36 +0100 | [diff] [blame] | 1503 | static void cleanup_rx_thread(void *arg) |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1504 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1505 | vppjni_main_t * jm = &vppjni_main; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1506 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1507 | vppjni_lock (jm, 99); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1508 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1509 | int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **)&(jm->jenv), JNI_VERSION_1_6); |
| 1510 | if (getEnvStat == JNI_EVERSION) { |
| 1511 | clib_warning ("Unsupported JNI version\n"); |
| 1512 | jm->retval = -999; |
| 1513 | goto out; |
| 1514 | } else if (getEnvStat != JNI_EDETACHED) { |
| 1515 | (*jm->jvm)->DetachCurrentThread(jm->jvm); |
| 1516 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1517 | out: |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1518 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1519 | } |
| 1520 | |
| 1521 | static void |
| 1522 | vl_api_show_version_reply_t_handler (vl_api_show_version_reply_t * mp) |
| 1523 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1524 | vppjni_main_t * jm = &vppjni_main; |
| 1525 | i32 retval = ntohl(mp->retval); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1526 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1527 | if (retval >= 0) { |
| 1528 | DEBUG_LOG ("show version request succeeded(%d)"); |
| 1529 | strncpy((char*)jm->program_name, (const char*)mp->program, |
| 1530 | sizeof(jm->program_name)-1); |
| 1531 | jm->program_name[sizeof(jm->program_name)-1] = 0; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1532 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1533 | strncpy((char*)jm->build_directory, (const char*)mp->build_directory, |
| 1534 | sizeof(jm->build_directory)-1); |
| 1535 | jm->build_directory[sizeof(jm->build_directory)-1] = 0; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1536 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1537 | strncpy((char*)jm->version, (const char*)mp->version, |
| 1538 | sizeof(jm->version)-1); |
| 1539 | jm->version[sizeof(jm->version)-1] = 0; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1540 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1541 | strncpy((char*)jm->build_date, (const char*)mp->build_date, |
| 1542 | sizeof(jm->build_date)-1); |
| 1543 | jm->build_date[sizeof(jm->build_date)-1] = 0; |
| 1544 | } else { |
| 1545 | clib_error ("show version request failed(%d)", retval); |
| 1546 | } |
| 1547 | jm->retval = retval; |
| 1548 | jm->result_ready = 1; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1549 | } |
| 1550 | |
| 1551 | static void vl_api_want_stats_reply_t_handler (vl_api_want_stats_reply_t * mp) |
| 1552 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1553 | vppjni_main_t * jm = &vppjni_main; |
| 1554 | jm->retval = mp->retval; // FIXME: vpp api does not do ntohl on this retval |
| 1555 | jm->result_ready = 1; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1556 | } |
| 1557 | |
| 1558 | // control ping needs to be very first thing called |
| 1559 | // to attach rx thread to java thread |
| 1560 | static void vl_api_control_ping_reply_t_handler |
| 1561 | (vl_api_control_ping_reply_t * mp) |
| 1562 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1563 | vppjni_main_t * jm = &vppjni_main; |
| 1564 | i32 retval = ntohl(mp->retval); |
| 1565 | jm->retval = retval; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1566 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1567 | // attach to java thread if not attached |
| 1568 | int getEnvStat = (*jm->jvm)->GetEnv(jm->jvm, (void **)&(jm->jenv), JNI_VERSION_1_6); |
| 1569 | if (getEnvStat == JNI_EDETACHED) { |
| 1570 | if ((*jm->jvm)->AttachCurrentThread(jm->jvm, (void **)&(jm->jenv), NULL) != 0) { |
| 1571 | clib_warning("Failed to attach thread\n"); |
| 1572 | jm->retval = -999; |
| 1573 | goto out; |
| 1574 | } |
| 1575 | |
| 1576 | // workaround as we can't use pthread_cleanup_push |
| 1577 | pthread_key_create(&jm->cleanup_rx_thread_key, cleanup_rx_thread); |
| 1578 | // destructor is only called if the value of key is non null |
| 1579 | pthread_setspecific(jm->cleanup_rx_thread_key, (void *)1); |
| 1580 | } else if (getEnvStat == JNI_EVERSION) { |
| 1581 | clib_warning ("Unsupported JNI version\n"); |
| 1582 | jm->retval = -999; |
| 1583 | goto out; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1584 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1585 | // jm->jenv is now stable global reference that can be reused (only within RX thread) |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1586 | |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1587 | #if 0 |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1588 | // ! callback system removed for now |
| 1589 | // |
| 1590 | // get issuer msg-id |
| 1591 | p = hash_get (jm->ping_hash, context); |
| 1592 | if (p != 0) { // ping marks end of some dump call |
| 1593 | JNIEnv *env = jm->jenv; |
| 1594 | u16 msg_id = (u16)p[0]; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1595 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1596 | // we will no longer need this |
| 1597 | hash_unset (jm->ping_hash, context); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1598 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1599 | // get original caller obj |
| 1600 | p = hash_get (jm->callback_hash, context); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1601 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1602 | if (p == 0) // don't have callback stored |
| 1603 | goto out; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1604 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1605 | jobject obj = (jobject)p[0]; // object that called original call |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1606 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1607 | switch (msg_id) { |
| 1608 | case VL_API_SW_INTERFACE_DUMP: |
| 1609 | if (0 != sw_if_dump_call_all_callbacks(obj)) { |
| 1610 | goto out2; |
| 1611 | } |
| 1612 | break; |
| 1613 | default: |
| 1614 | clib_warning("Unhandled control ping issuer msg-id: %d", msg_id); |
| 1615 | goto out2; |
| 1616 | break; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1617 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1618 | out2: |
| 1619 | // free the saved obj |
| 1620 | hash_unset (jm->callback_hash, context); |
| 1621 | // delete global reference |
| 1622 | (*env)->DeleteGlobalRef(env, obj); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1623 | } |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1624 | #endif |
| 1625 | |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1626 | out: |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1627 | jm->result_ready = 1; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1628 | } |
| 1629 | |
| 1630 | #define VPPJNI_DEBUG_COUNTERS 0 |
| 1631 | |
| 1632 | static void vl_api_vnet_interface_counters_t_handler |
| 1633 | (vl_api_vnet_interface_counters_t *mp) |
| 1634 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1635 | vppjni_main_t *jm = &vppjni_main; |
| 1636 | CLIB_UNUSED(char *counter_name); |
| 1637 | u32 count, sw_if_index; |
| 1638 | int i; |
| 1639 | static sw_interface_stats_t empty_stats = {0, }; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1640 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1641 | vppjni_lock (jm, 12); |
| 1642 | count = ntohl (mp->count); |
| 1643 | sw_if_index = ntohl (mp->first_sw_if_index); |
| 1644 | if (mp->is_combined == 0) { |
| 1645 | u64 * vp, v; |
| 1646 | vp = (u64 *) mp->data; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1647 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1648 | for (i = 0; i < count; i++) { |
| 1649 | sw_interface_details_t *sw_if = NULL; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1650 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1651 | v = clib_mem_unaligned (vp, u64); |
| 1652 | v = clib_net_to_host_u64 (v); |
| 1653 | vp++; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1654 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1655 | if (sw_if_index < vec_len(jm->sw_if_table)) |
| 1656 | sw_if = vec_elt_at_index(jm->sw_if_table, sw_if_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1657 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1658 | if (sw_if /* && (sw_if->admin_up_down == 1)*/ && sw_if->interface_name[0] != 0) { |
| 1659 | vec_validate_init_empty(jm->sw_if_stats_by_sw_if_index, sw_if_index, empty_stats); |
| 1660 | sw_interface_stats_t * s = vec_elt_at_index(jm->sw_if_stats_by_sw_if_index, sw_if_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1661 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1662 | s->sw_if_index = sw_if_index; |
| 1663 | s->valid = 1; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1664 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1665 | switch (mp->vnet_counter_type) { |
| 1666 | case VNET_INTERFACE_COUNTER_DROP: |
| 1667 | counter_name = "drop"; |
| 1668 | s->rx.pkts.discard = v; |
| 1669 | break; |
| 1670 | case VNET_INTERFACE_COUNTER_PUNT: |
| 1671 | counter_name = "punt"; |
| 1672 | s->rx.pkts.unknown_proto = v; |
| 1673 | break; |
| 1674 | case VNET_INTERFACE_COUNTER_IP4: |
| 1675 | counter_name = "ip4"; |
| 1676 | s->rx.pkts.ip4 = v; |
| 1677 | break; |
| 1678 | case VNET_INTERFACE_COUNTER_IP6: |
| 1679 | counter_name = "ip6"; |
| 1680 | s->rx.pkts.ip6 = v; |
| 1681 | break; |
| 1682 | case VNET_INTERFACE_COUNTER_RX_NO_BUF: |
| 1683 | counter_name = "rx-no-buf"; |
| 1684 | s->rx.pkts.fifo_full = v; |
| 1685 | break; |
| 1686 | case VNET_INTERFACE_COUNTER_RX_MISS: |
| 1687 | counter_name = "rx-miss"; |
| 1688 | s->rx.pkts.miss = v; |
| 1689 | break; |
| 1690 | case VNET_INTERFACE_COUNTER_RX_ERROR: |
| 1691 | counter_name = "rx-error"; |
| 1692 | s->rx.pkts.error = v; |
| 1693 | break; |
| 1694 | case VNET_INTERFACE_COUNTER_TX_ERROR: |
| 1695 | counter_name = "tx-error (fifo-full)"; |
| 1696 | s->tx.pkts.fifo_full = v; |
| 1697 | break; |
| 1698 | default: |
| 1699 | counter_name = "bogus"; |
| 1700 | break; |
| 1701 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1702 | |
| 1703 | #if VPPJNI_DEBUG_COUNTERS == 1 |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1704 | clib_warning ("%s (%d): %s (%lld)\n", sw_if->interface_name, s->sw_if_index, |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1705 | counter_name, v); |
| 1706 | #endif |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1707 | } |
| 1708 | sw_if_index++; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1709 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1710 | } else { |
| 1711 | vlib_counter_t *vp; |
| 1712 | u64 packets, bytes; |
| 1713 | vp = (vlib_counter_t *) mp->data; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1714 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1715 | for (i = 0; i < count; i++) { |
| 1716 | sw_interface_details_t *sw_if = NULL; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1717 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1718 | packets = clib_mem_unaligned (&vp->packets, u64); |
| 1719 | packets = clib_net_to_host_u64 (packets); |
| 1720 | bytes = clib_mem_unaligned (&vp->bytes, u64); |
| 1721 | bytes = clib_net_to_host_u64 (bytes); |
| 1722 | vp++; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1723 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1724 | if (sw_if_index < vec_len(jm->sw_if_table)) |
| 1725 | sw_if = vec_elt_at_index(jm->sw_if_table, sw_if_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1726 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1727 | if (sw_if /* && (sw_if->admin_up_down == 1) */ && sw_if->interface_name[0] != 0) { |
| 1728 | vec_validate_init_empty(jm->sw_if_stats_by_sw_if_index, sw_if_index, empty_stats); |
| 1729 | sw_interface_stats_t * s = vec_elt_at_index(jm->sw_if_stats_by_sw_if_index, sw_if_index); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1730 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1731 | s->valid = 1; |
| 1732 | s->sw_if_index = sw_if_index; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1733 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1734 | switch (mp->vnet_counter_type) { |
| 1735 | case VNET_INTERFACE_COUNTER_RX: |
| 1736 | s->rx.pkts.unicast = packets; |
| 1737 | s->rx.octets = bytes; |
| 1738 | counter_name = "rx"; |
| 1739 | break; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1740 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1741 | case VNET_INTERFACE_COUNTER_TX: |
| 1742 | s->tx.pkts.unicast = packets; |
| 1743 | s->tx.octets = bytes; |
| 1744 | counter_name = "tx"; |
| 1745 | break; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1746 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1747 | default: |
| 1748 | counter_name = "bogus"; |
| 1749 | break; |
| 1750 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1751 | |
| 1752 | #if VPPJNI_DEBUG_COUNTERS == 1 |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1753 | clib_warning ("%s (%d): %s.packets %lld\n", |
| 1754 | sw_if->interface_name, |
| 1755 | sw_if_index, counter_name, packets); |
| 1756 | clib_warning ("%s (%d): %s.bytes %lld\n", |
| 1757 | sw_if->interface_name, |
| 1758 | sw_if_index, counter_name, bytes); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1759 | #endif |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1760 | } |
| 1761 | sw_if_index++; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1762 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1763 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1764 | vppjni_unlock (jm); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1765 | } |
| 1766 | |
| 1767 | jint JNI_OnLoad(JavaVM *vm, void *reserved) { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1768 | vppjni_main_t * jm = &vppjni_main; |
| 1769 | JNIEnv* env; |
| 1770 | if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) { |
| 1771 | return JNI_ERR; |
| 1772 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1773 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1774 | if (vppjni_init(env) != 0) { |
| 1775 | return JNI_ERR; |
| 1776 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1777 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1778 | jm->jvm = vm; |
| 1779 | return JNI_VERSION_1_6; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1780 | } |
| 1781 | |
| 1782 | void JNI_OnUnload(JavaVM *vm, void *reserved) { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1783 | vppjni_main_t * jm = &vppjni_main; |
| 1784 | JNIEnv* env; |
| 1785 | if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_6) != JNI_OK) { |
| 1786 | return; |
| 1787 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1788 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1789 | vppjni_uninit(env); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1790 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1791 | jm->jenv = NULL; |
| 1792 | jm->jvm = NULL; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1793 | } |
| 1794 | |
| 1795 | #define foreach_vpe_api_msg \ |
| 1796 | _(CONTROL_PING_REPLY, control_ping_reply) \ |
| 1797 | _(SW_INTERFACE_DETAILS, sw_interface_details) \ |
| 1798 | _(SHOW_VERSION_REPLY, show_version_reply) \ |
| 1799 | _(WANT_STATS_REPLY, want_stats_reply) \ |
| 1800 | _(VNET_INTERFACE_COUNTERS, vnet_interface_counters) \ |
| 1801 | _(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \ |
| 1802 | _(BRIDGE_DOMAIN_DETAILS, bridge_domain_details) \ |
| 1803 | _(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details) \ |
Dave Wallace | bf8c15e | 2015-12-17 20:54:54 -0500 | [diff] [blame] | 1804 | _(L2_FIB_TABLE_ENTRY, l2_fib_table_entry) \ |
| 1805 | _(IP_ADDRESS_DETAILS, ip_address_details) \ |
| 1806 | _(VXLAN_TUNNEL_DETAILS, vxlan_tunnel_details) |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1807 | |
| 1808 | static int connect_to_vpe(char *name) |
| 1809 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1810 | vppjni_main_t * jm = &vppjni_main; |
| 1811 | api_main_t * am = &api_main; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1812 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1813 | if (vl_client_connect_to_vlib("/vpe-api", name, 32) < 0) |
| 1814 | return -1; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1815 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1816 | jm->my_client_index = am->my_client_index; |
| 1817 | jm->vl_input_queue = am->shmem_hdr->vl_input_queue; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1818 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1819 | #define _(N,n) \ |
| 1820 | vl_msg_api_set_handlers(VL_API_##N, #n, \ |
| 1821 | vl_api_##n##_t_handler, \ |
| 1822 | vl_noop_handler, \ |
| 1823 | vl_api_##n##_t_endian, \ |
| 1824 | vl_api_##n##_t_print, \ |
| 1825 | sizeof(vl_api_##n##_t), 1); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1826 | foreach_vpe_api_msg; |
| 1827 | #undef _ |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1828 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1829 | return 0; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1830 | } |
| 1831 | |
| 1832 | /* Format an IP6 address. */ |
| 1833 | u8 * format_ip6_address (u8 * s, va_list * args) |
| 1834 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1835 | ip6_address_t * a = va_arg (*args, ip6_address_t *); |
| 1836 | u32 max_zero_run = 0, this_zero_run = 0; |
| 1837 | int max_zero_run_index = -1, this_zero_run_index=0; |
| 1838 | int in_zero_run = 0, i; |
| 1839 | int last_double_colon = 0; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1840 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1841 | /* Ugh, this is a pain. Scan forward looking for runs of 0's */ |
| 1842 | for (i = 0; i < ARRAY_LEN (a->as_u16); i++) { |
| 1843 | if (a->as_u16[i] == 0) { |
| 1844 | if (in_zero_run) { |
| 1845 | this_zero_run++; |
| 1846 | } else { |
| 1847 | in_zero_run = 1; |
| 1848 | this_zero_run =1; |
| 1849 | this_zero_run_index = i; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1850 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1851 | } else { |
| 1852 | if (in_zero_run) { |
| 1853 | /* offer to compress the biggest run of > 1 zero */ |
| 1854 | if (this_zero_run > max_zero_run && this_zero_run > 1) { |
| 1855 | max_zero_run_index = this_zero_run_index; |
| 1856 | max_zero_run = this_zero_run; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1857 | } |
| 1858 | } |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1859 | in_zero_run = 0; |
| 1860 | this_zero_run = 0; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1861 | } |
| 1862 | } |
| 1863 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1864 | if (in_zero_run) { |
| 1865 | if (this_zero_run > max_zero_run && this_zero_run > 1) { |
| 1866 | max_zero_run_index = this_zero_run_index; |
| 1867 | max_zero_run = this_zero_run; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1868 | } |
| 1869 | } |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1870 | |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1871 | for (i = 0; i < ARRAY_LEN (a->as_u16); i++) { |
| 1872 | if (i == max_zero_run_index) { |
| 1873 | s = format (s, "::"); |
| 1874 | i += max_zero_run - 1; |
| 1875 | last_double_colon = 1; |
| 1876 | } else { |
| 1877 | s = format (s, "%s%x", |
| 1878 | (last_double_colon || i == 0) ? "" : ":", |
| 1879 | clib_net_to_host_u16 (a->as_u16[i])); |
| 1880 | last_double_colon = 0; |
| 1881 | } |
| 1882 | } |
| 1883 | |
| 1884 | return s; |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1885 | } |
| 1886 | |
| 1887 | /* Format an IP4 address. */ |
| 1888 | u8 * format_ip4_address (u8 * s, va_list * args) |
| 1889 | { |
Robert Varga | d0f9209 | 2016-02-10 14:39:57 +0100 | [diff] [blame] | 1890 | u8 * a = va_arg (*args, u8 *); |
| 1891 | return format (s, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]); |
Ed Warnicke | cb9cada | 2015-12-08 15:45:58 -0700 | [diff] [blame] | 1892 | } |
| 1893 | |
| 1894 | |