/*
 * Copyright 2018 Anton Tananaev (anton@traccar.org)
 * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org)
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.traccar.helper;

import java.nio.charset.StandardCharsets;

import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;

public final class BufferUtil {

    private BufferUtil() {
    }

    public static int indexOf(String needle, ByteBuf haystack) {
        ByteBuf needleBuffer = Unpooled.wrappedBuffer(needle.getBytes(StandardCharsets.US_ASCII));
        try {
            return ByteBufUtil.indexOf(needleBuffer, haystack);
        } finally {
            needleBuffer.release();
        }
    }

    public static int indexOf(String needle, ByteBuf haystack, int startIndex, int endIndex) {
        haystack = Unpooled.wrappedBuffer(haystack);
        haystack.readerIndex(startIndex);
        haystack.writerIndex(endIndex);
        return indexOf(needle, haystack);
    }

}

@@ -1321,25 +1321,40 @@
 ) %7B%0A        
-h
+ByteBuf wrappedH
 aystack = Un
@@ -1385,33 +1385,40 @@
 stack);%0A        
-h
+wrappedH
 aystack.readerIn
@@ -1427,24 +1427,49 @@
 x(startIndex
+ - haystack.readerIndex()
 );%0A        h
@@ -1467,17 +1467,24 @@
         
-h
+wrappedH
 aystack.
@@ -1507,51 +1507,159 @@
 ndex
-);%0A        return indexOf(needle, haystack)
+ - haystack.readerIndex());%0A        int result = indexOf(needle, wrappedHaystack);%0A        return result %3C 0 ? result : haystack.readerIndex() + result
 ;%0A  

Fix buffer search utility