From 035dbd438ab454da6236dfda7547f94f6102a4cc Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Fri, 30 Mar 2018 17:12:02 +0900 Subject: [PATCH] apf: adjust JNI to accept_packet()'s new signature Bug: 73804303 Test: runtest -x tests/net/java/android/net/apf/ApfTest.java Merged-Id: I0a3ad562496f3e06bc9527af4e038be3cdfe25c6 Merged-Id: I1674ac22f00af037ad415a4436b94b2eec6a02b7 Merged-Id: I966776e6574cbf167a6148e20d40e2bdcc887327 Change-Id: Id5c3cec5459ce6f9693457448002e60bbca6c09b (cherry picked from commit 64bc32c5d4ae8a5c479a15615f99180476e9b2fa) --- tests/net/jni/apf_jni.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/net/jni/apf_jni.cpp b/tests/net/jni/apf_jni.cpp index d415d225e7df..152e6c34aa48 100644 --- a/tests/net/jni/apf_jni.cpp +++ b/tests/net/jni/apf_jni.cpp @@ -34,6 +34,8 @@ static jint com_android_server_ApfTest_apfSimulate( env->GetArrayLength(program), (uint8_t*)env->GetByteArrayElements(packet, NULL), env->GetArrayLength(packet), + nullptr, + 0, filter_age); } @@ -143,7 +145,8 @@ static jboolean com_android_server_ApfTest_compareBpfApf(JNIEnv* env, jclass, js do { apf_packet = pcap_next(apf_pcap.get(), &apf_header); } while (apf_packet != NULL && !accept_packet( - apf_program, apf_program_len, apf_packet, apf_header.len, 0)); + apf_program, apf_program_len, apf_packet, apf_header.len, + nullptr, 0, 0)); // Make sure both filters matched the same packet. if (apf_packet == NULL && bpf_packet == NULL) -- 2.11.0