You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2006/01/27 14:27:27 UTC
svn commit: r372841 - in /webservices/axis2/trunk/c: include/ modules/
modules/core/transport/http/server/ modules/platforms/unix/ modules/util/
test/util/
Author: sahan
Date: Fri Jan 27 05:27:03 2006
New Revision: 372841
URL: http://svn.apache.org/viewcvs?rev=372841&view=rev
Log:
Removed MAC address removing logic from network handler and added to platform dependent code. Added some error codes/messages. Fixed a build break
Modified:
webservices/axis2/trunk/c/include/axis2_error.h
webservices/axis2/trunk/c/include/axis2_network_handler.h
webservices/axis2/trunk/c/modules/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am
webservices/axis2/trunk/c/modules/platforms/unix/Makefile.am
webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h
webservices/axis2/trunk/c/modules/platforms/unix/axis2_uuid_gen_unix.h
webservices/axis2/trunk/c/modules/platforms/unix/uuid_gen_unix.c
webservices/axis2/trunk/c/modules/util/error.c
webservices/axis2/trunk/c/modules/util/network_handler.c
webservices/axis2/trunk/c/modules/util/uuid_gen.c
webservices/axis2/trunk/c/test/util/Makefile.am
Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Fri Jan 27 05:27:03 2006
@@ -457,6 +457,8 @@
AXIS2_ERROR_INVALID_STATE_DLL_DESC,
/* Null soap envelope in msg_ctx */
AXIS2_ERROR_NULL_SOAP_ENVELOPE_IN_MSG_CTX,
+ /* Generation of platform dependent uuid failed */
+ AXIS2_ERROR_UUID_GEN_FAILED,
/** The following has to be the last error value all the time.
All other error codes should appear above this.
AXIS2_ERROR_LAST is used to track the number of error codes present
Modified: webservices/axis2/trunk/c/include/axis2_network_handler.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_network_handler.h?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_network_handler.h (original)
+++ webservices/axis2/trunk/c/include/axis2_network_handler.h Fri Jan 27 05:27:03 2006
@@ -79,13 +79,6 @@
*/
AXIS2_DECLARE(int)
axis2_network_handler_svr_socket_accept(axis2_env_t **env, int socket);
-
-/**
- * Returns the mac address of the first interface
- * @return MAC address of the first interface
- */
-AXIS2_DECLARE(char *)
-axis2_network_handler_get_mac_addr(axis2_env_t **env);
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/Makefile.am?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/Makefile.am Fri Jan 27 05:27:03 2006
@@ -1 +1 @@
-SUBDIRS = util xml wsdl core platforms/unix
+SUBDIRS = platforms/unix util xml wsdl core
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am Fri Jan 27 05:27:03 2006
@@ -4,7 +4,7 @@
AM_CPPFLAGS = $(CPPFLAGS) -g -pthread
axis2_http_server_SOURCES = http_server_main.c
-axis2_http_server_LDADD = $(LDFLAGS) -laxis2_util -laxis2_http_transport -laxis2_context -laxis2_addr -laxis2_om -laxis2_engine -laxis2_description -laxis2_soap -laxis2_wsdl -laxis2_phaseresolver -laxis2_core_util -laxis2_deployment -laxis2_libxml2 -laxis2_http_sender -laxis2_http_receiver -lxml2\
+axis2_http_server_LDADD = $(LDFLAGS) -laxis2_util -laxis2_http_transport -laxis2_context -laxis2_addr -laxis2_om -laxis2_engine -laxis2_description -laxis2_soap -laxis2_wsdl -laxis2_phaseresolver -laxis2_core_util -laxis2_deployment -laxis2_libxml2 -laxis2_http_sender -laxis2_http_receiver -lxml2 -laxis2_unix\
-L$(top_builddir)/modules/util/.libs\
-L$(top_builddir)/modules/wsdl/.libs\
-L$(top_builddir)/modules/core/description/.libs\
@@ -20,6 +20,7 @@
-L$(top_builddir)/modules/xml/om/.libs\
-L$(top_builddir)/modules/xml/parser/libxml2/.libs\
-L$(top_builddir)/modules/xml/soap/.libs\
+-L$(top_builddir)/modules/platforms/unix/.libs\
-L$(LIBXML2_LIB) $(LIBXML2_LIBNAME) \
-L$(GUTHTHILA_LIB) $(GUTHTHILA_LIBNAME)
Modified: webservices/axis2/trunk/c/modules/platforms/unix/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/unix/Makefile.am?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/unix/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/platforms/unix/Makefile.am Fri Jan 27 05:27:03 2006
@@ -3,5 +3,5 @@
libaxis2_unix_la_SOURCES = uuid_gen_unix.c
libaxis2_unix_la_LIBADD =
-INCLUDES = -I$(top_builddir)/include\
+INCLUDES = -I$(top_builddir)/include\
-I$(top_builddir)/modules/platforms
Modified: webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h (original)
+++ webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h Fri Jan 27 05:27:03 2006
@@ -106,6 +106,7 @@
#include <strings.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include "axis2_uuid_gen_unix.h" /* uuid_gen unix implementation */
#define AXIS2_STRRCHR(x, y) (strrchr(x, y))
Modified: webservices/axis2/trunk/c/modules/platforms/unix/axis2_uuid_gen_unix.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/unix/axis2_uuid_gen_unix.h?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/unix/axis2_uuid_gen_unix.h (original)
+++ webservices/axis2/trunk/c/modules/platforms/unix/axis2_uuid_gen_unix.h Fri Jan 27 05:27:03 2006
@@ -78,7 +78,7 @@
* @return generated uuid as a string
*/
axis2_char_t* AXIS2_CALL
-axis2_uuid_gen();
+axis2_platform_uuid_gen();
/** @} */
Modified: webservices/axis2/trunk/c/modules/platforms/unix/uuid_gen_unix.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/unix/uuid_gen_unix.c?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/unix/uuid_gen_unix.c (original)
+++ webservices/axis2/trunk/c/modules/platforms/unix/uuid_gen_unix.c Fri Jan 27 05:27:03 2006
@@ -149,7 +149,7 @@
axis2_char_t* AXIS2_CALL
-axis2_uuid_gen()
+axis2_platform_uuid_gen()
{
axis2_uuid_t *uuid_struct = NULL;
axis2_char_t *uuid_str = NULL;
Modified: webservices/axis2/trunk/c/modules/util/error.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/error.c?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/error.c (original)
+++ webservices/axis2/trunk/c/modules/util/error.c Fri Jan 27 05:27:03 2006
@@ -389,6 +389,8 @@
of valid delete function or valid dll_handler";
axis2_error_messages[AXIS2_ERROR_NULL_SOAP_ENVELOPE_IN_MSG_CTX] =
"Null soap envelope in msg_ctx";
+ axis2_error_messages[AXIS2_ERROR_UUID_GEN_FAILED] =
+ "Generation of platform dependent uuid failed";
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/util/network_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/network_handler.c?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/network_handler.c (original)
+++ webservices/axis2/trunk/c/modules/util/network_handler.c Fri Jan 27 05:27:03 2006
@@ -24,7 +24,7 @@
#include <netdb.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#include <linux/if.h>
+
int AXIS2_CALL
axis2_network_handler_open_socket(axis2_env_t **env, char *server, int port)
@@ -165,35 +165,4 @@
AXIS2_LOG_WRITE((*env)->log, "[Axis2][network_handler] Socket accept \
failed", AXIS2_LOG_ERROR);
return cli_socket;
-}
-
-char * AXIS2_CALL
-axis2_network_handler_get_mac_addr(axis2_env_t **env)
-{
- struct ifreq ifr;
- struct sockaddr *sa;
- int s = 0;
- int i = 0;
- char *buffer = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
-
- if ((s = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
- return NULL;
- sprintf(ifr.ifr_name, "eth0");
- if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0)
- {
- close(s);
- return NULL;
- }
- buffer = AXIS2_MALLOC((*env)->allocator, 6*sizeof(char));
- if(NULL == buffer)
- {
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- }
- sa = (struct sockaddr *)&ifr.ifr_addr;
- for (i = 0; i < 6; i++)
- buffer[i] = (unsigned char)(sa->sa_data[i] & 0xff);
- close(s);
- return buffer;
}
Modified: webservices/axis2/trunk/c/modules/util/uuid_gen.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/uuid_gen.c?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/uuid_gen.c (original)
+++ webservices/axis2/trunk/c/modules/util/uuid_gen.c Fri Jan 27 05:27:03 2006
@@ -22,9 +22,9 @@
axis2_char_t * AXIS2_CALL
-axis2_uuid_gen(axis2_env **env)
+axis2_uuid_gen(axis2_env_t **env)
{
- axis2_char_t *str = axis2_uuid_get();
+ axis2_char_t *str = axis2_platform_uuid_gen();
if (str == NULL)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_UUID_GEN_FAILED,
Modified: webservices/axis2/trunk/c/test/util/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/util/Makefile.am?rev=372841&r1=372840&r2=372841&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/util/Makefile.am Fri Jan 27 05:27:03 2006
@@ -4,7 +4,7 @@
AM_CPPFLAGS = $(CPPFLAGS)
test_util_SOURCES = test_util.c
-test_util_LDADD = -L$(AXIS2C_HOME)/lib -laxis2_util
+test_util_LDADD = -L$(AXIS2C_HOME)/lib -laxis2_util -laxis2_unix
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/util \