Commit 08238af7 authored by Ben Walker's avatar Ben Walker Committed by Daniel Verkamp
Browse files

util: Add a function to parse ip addresses. 



This function parses in place by inserting null terminators.

Change-Id: I61cb97b87ec05d0183fbaa993fd3d7580a188bde
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 8314b549

include/spdk/string.h

+15 −0
Original line number Diff line number Diff line
@@ -113,6 +113,21 @@ void spdk_strcpy_pad(void *dst, const char *src, size_t size, int pad); 
 */

size_t spdk_strlen_pad(const void *str, size_t size, int pad);



/**

 * Parse an IP address into its hostname and port components.

 * This modifies the IP address in place.

 *

 * \param ip A null terminated IP address, including port.

 *           Both IPv4 and IPv6 are supported.

 * \param host Will point to the start of the hostname within ip.

 *             The string will be null terminated.

 * \param port Will point to the start of the port within ip.

 *             The string will be null terminated.

 *

 * \return 0 if successful. -1 on error.

 */

int spdk_parse_ip_addr(char *ip, const char **host, const char **port);



#ifdef __cplusplus

}

#endif

lib/util/string.c

+56 −0
Original line number Diff line number Diff line
@@ -256,3 +256,59 @@ spdk_strlen_pad(const void *str, size_t size, int pad) 
		iter--;

	}

}



int

spdk_parse_ip_addr(char *ip, const char **host, const char **port)

{

	char *p;



	if (ip == NULL) {

		return -1;

	}



	*host = NULL;

	*port = NULL;



	if (ip[0] == '[') {

		/* IPv6 */

		p = strchr(ip, ']');

		if (p == NULL) {

			return -1;

		}

		*host = &ip[1];

		*p = '\0';



		p++;

		if (*p == '\0') {

			return 0;

		} else if (*p != ':') {

			return -1;

		}



		p++;

		if (*p == '\0') {

			return 0;

		}



		*port = p;

	} else {

		/* IPv4 */

		p = strchr(ip, ':');

		if (p == NULL) {

			*host = ip;

			return 0;

		}



		*host = ip;

		*p = '\0';



		p++;

		if (*p == '\0') {

			return 0;

		}



		*port = p;

	}



	return 0;

}

test/lib/util/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



DIRS-y = bit_array io_channel

DIRS-y = bit_array io_channel string



.PHONY: all clean $(DIRS-y)

test/lib/util/string/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
string_ut

test/lib/util/string/Makefile

0 → 100644
+52 −0
Original line number Diff line number Diff line 
#

#  BSD LICENSE

#

#  Copyright (c) Intel Corporation.

#  All rights reserved.

#

#  Redistribution and use in source and binary forms, with or without

#  modification, are permitted provided that the following conditions

#  are met:

#

#    * Redistributions of source code must retain the above copyright

#      notice, this list of conditions and the following disclaimer.

#    * Redistributions in binary form must reproduce the above copyright

#      notice, this list of conditions and the following disclaimer in

#      the documentation and/or other materials provided with the

#      distribution.

#    * Neither the name of Intel Corporation nor the names of its

#      contributors may be used to endorse or promote products derived

#      from this software without specific prior written permission.

#

#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#



SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/util

APP = string_ut

C_SRCS := string_ut.c



LIBS += -lcunit



all : $(APP)



$(APP) : $(OBJS) $(SPDK_LIBS)

	$(LINK_C)



clean :

	$(CLEAN_C) $(APP)



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk