/*\r
- * $Id: fce_api.c,v 0.01 2010-10-01 00:00:0 mw Exp $\r
- *\r
* Copyright (c) 2010 Mark Williams\r
*\r
* File change event API for netatalk\r
#include <atalk/util.h>\r
#include <atalk/cnid.h>\r
#include <atalk/unix.h>\r
+#include <atalk/fce_api.h>\r
\r
#include "fork.h"\r
#include "file.h"\r
#include "desktop.h"\r
#include "volume.h"\r
\r
-#include "fce_api.h"\r
-\r
// ONLY USED IN THIS FILE\r
#include "fce_api_internal.h"\r
\r
* */\r
void fce_init_udp()\r
{\r
+ int rv;\r
+ struct addrinfo hints, *servinfo, *p;\r
+\r
if (udp_initialized == FCE_TRUE)\r
return;\r
\r
+ memset(&hints, 0, sizeof hints);\r
+ hints.ai_family = AF_UNSPEC;\r
+ hints.ai_socktype = SOCK_DGRAM;\r
\r
- for (int i = 0; i < udp_sockets; i++)\r
- {\r
+ for (int i = 0; i < udp_sockets; i++) {\r
struct udp_entry *udp_entry = udp_socket_list + i;\r
\r
/* Close any pending sockets */\r
if (udp_entry->sock != -1)\r
- {\r
- close( udp_entry->sock );\r
+ close(udp_entry->sock);\r
+\r
+ if ((rv = getaddrinfo(udp_entry->addr, udp_entry->port, &hints, &servinfo)) != 0) {\r
+ LOG(log_error, logtype_afpd, "fce_init_udp: getaddrinfo(%s:%s): %s",\r
+ udp_entry->addr, udp_entry->port, gai_strerror(rv));\r
+ continue;\r
}\r
\r
- /* resolve IP to network address */\r
- if (inet_aton( udp_entry->ip, &udp_entry->addr.sin_addr ) ==0 )\r
- {\r
- /* Hmm, failed try to resolve host */\r
- struct hostent *hp = gethostbyname( udp_entry->ip );\r
- if (hp == NULL)\r
- {\r
- LOG(log_error, logtype_afpd, "Cannot resolve host name for fce UDP connection: %s (errno %d)", udp_entry->ip, errno );\r
+ /* loop through all the results and make a socket */\r
+ for (p = servinfo; p != NULL; p = p->ai_next) {\r
+ if ((udp_entry->sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {\r
+ LOG(log_error, logtype_afpd, "fce_init_udp: socket(%s:%s): %s",\r
+ udp_entry->addr, udp_entry->port, strerror(errno));\r
continue;\r
}\r
- memcpy( &udp_entry->addr.sin_addr, &hp->h_addr, sizeof(udp_entry->addr.sin_addr) );\r
+ break;\r
}\r
\r
- /* Create UDP socket */\r
- udp_entry->sock = socket( AF_INET, SOCK_DGRAM, 0 );\r
- if (udp_entry->sock == -1)\r
- {\r
- LOG(log_error, logtype_afpd, "Cannot create socket for fce UDP connection: errno %d", errno );\r
- continue;\r
+ if (p == NULL) {\r
+ LOG(log_error, logtype_afpd, "fce_init_udp: no socket for %s:%s",\r
+ udp_entry->addr, udp_entry->port);\r
}\r
-\r
- /* Set socket address params */\r
- udp_entry->addr.sin_family = AF_INET;\r
- udp_entry->addr.sin_port = htons(udp_entry->port);\r
+ memcpy(&udp_entry->addrinfo, p, sizeof(struct addrinfo));\r
+ freeaddrinfo(servinfo);\r
}\r
- udp_initialized = FCE_TRUE;\r
\r
+ udp_initialized = FCE_TRUE;\r
}\r
+\r
void fce_cleanup()\r
{\r
if (udp_initialized == FCE_FALSE )\r
/* Okay, we have a running socket again, send server that we had a problem on our side*/\r
data_len = build_fce_packet( &packet, "", FCE_CONN_BROKEN, 0 );\r
\r
- sendto( udp_entry->sock, data, data_len, 0, &udp_entry->addr, sizeof(udp_entry->addr) );\r
+ sendto(udp_entry->sock,\r
+ data,\r
+ data_len,\r
+ 0,\r
+ udp_entry->addrinfo.ai_addr,\r
+ udp_entry->addrinfo.ai_addrlen);\r
\r
/* Rebuild our original data packet */\r
data_len = build_fce_packet( &packet, path, mode, event_id );\r
}\r
\r
- sent_data = sendto( udp_entry->sock, data, data_len, 0, &udp_entry->addr, sizeof(udp_entry->addr) );\r
+ sent_data = sendto(udp_entry->sock,\r
+ data,\r
+ data_len,\r
+ 0,\r
+ udp_entry->addrinfo.ai_addr,\r
+ udp_entry->addrinfo.ai_addrlen);\r
\r
/* Problems ? */\r
if (sent_data != data_len)\r
}\r
}\r
\r
-static int add_udp_socket( char *target_ip, int target_port )\r
+static int add_udp_socket(const char *target_ip, const char *target_port )\r
{\r
- if (target_port == 0)\r
- target_port = FCE_DEFAULT_PORT;\r
+ if (target_port == NULL)\r
+ target_port = FCE_DEFAULT_PORT_STRING;\r
\r
- if (udp_sockets >= FCE_MAX_UDP_SOCKS)\r
- {\r
+ if (udp_sockets >= FCE_MAX_UDP_SOCKS) {\r
LOG(log_error, logtype_afpd, "Too many file change api UDP connections (max %d allowed)", FCE_MAX_UDP_SOCKS );\r
return AFPERR_PARAM;\r
}\r
\r
- strncpy( udp_socket_list[udp_sockets].ip, target_ip, FCE_MAX_IP_LEN - 1);\r
- udp_socket_list[udp_sockets].port = target_port;\r
+ udp_socket_list[udp_sockets].addr = strdup(target_ip);\r
+ udp_socket_list[udp_sockets].port = strdup(target_port);\r
udp_socket_list[udp_sockets].sock = -1;\r
- memset( &udp_socket_list[udp_sockets].addr, 0, sizeof(struct sockaddr_in) );\r
+ memset( &udp_socket_list[udp_sockets].addrinfo, 0, sizeof(struct sockaddr_in) );\r
udp_socket_list[udp_sockets].next_try_on_error = 0;\r
\r
udp_sockets++;\r
* */\r
static int register_fce( char *u_name, int is_dir, int mode )\r
{\r
+ if (udp_sockets == 0)\r
+ /* No listeners configured */\r
+ return AFP_OK;\r
+\r
if (u_name == NULL)\r
return AFPERR_PARAM;\r
\r
int fce_register_file_modification( struct ofork *ofork )\r
{\r
char *u_name = NULL;\r
- struct dir *dir;\r
struct vol *vol;\r
int ret = AFP_OK;\r
\r
- if (ofork == NULL || ofork->of_vol == NULL || ofork->of_dir == NULL)\r
+ if (ofork == NULL || ofork->of_vol == NULL)\r
return AFPERR_PARAM;\r
\r
vol = ofork->of_vol;\r
- dir = ofork->of_dir;\r
\r
- if (NULL == (u_name = mtoupath(vol, of_name(ofork), dir->d_did, utf8_encoding()))) \r
+ if (NULL == (u_name = mtoupath(vol, of_name(ofork), ofork->of_did, utf8_encoding()))) \r
{\r
return AFPERR_MISC;\r
}\r
* Extern connect to afpd parameter, can be called multiple times for multiple listeners (up to MAX_UDP_SOCKS times)\r
*\r
* */\r
-int fce_add_udp_socket( char *target )\r
+int fce_add_udp_socket(const char *target)\r
{\r
- int port = FCE_DEFAULT_PORT;\r
+ const char *port = FCE_DEFAULT_PORT_STRING;\r
char target_ip[256] = {""};\r
\r
- strncpy( target_ip, target, sizeof(target_ip) -1);\r
+ strncpy(target_ip, target, sizeof(target_ip) -1);\r
+\r
char *port_delim = strchr( target_ip, ':' );\r
- if (port_delim)\r
- {\r
+ if (port_delim) {\r
*port_delim = 0;\r
- port = atoi( port_delim + 1);\r
+ port = port_delim + 1;\r
}\r
- return add_udp_socket( target_ip, port );\r
+ return add_udp_socket(target_ip, port);\r
}\r
\r
\r
}\r
int main( int argc, char*argv[] )\r
{\r
- int port = 11250;\r
- char *host = NULL;\r
+ int c,ret;\r
+\r
+ char *port = FCE_DEFAULT_PORT_STRING;\r
+ char *host = "localhost";\r
int delay_between_events = 1000;\r
int event_code = FCE_FILE_MODIFY;\r
char pathbuff[1024];\r
int duration_in_seconds = 0; // TILL ETERNITY\r
-\r
+ char target[256];\r
char *path = getcwd( pathbuff, sizeof(pathbuff) );\r
\r
// FULLSPEED TEST IS "-s 1001" -> delay is 0 -> send packets without pause\r
\r
- if (argc == 1)\r
- {\r
- fprintf( stdout, "%s: -p Port -h Listener1 [ -h Listener2 ...] -P path -s Delay_between_events_in_us -e event_code -d Duration \n", argv[0]);\r
- exit( 1 );\r
- }\r
- int ret = AFP_OK;\r
-\r
- for (int i = 1; i < argc; i++)\r
- {\r
- char *p = argv[i];\r
- if (*p == '-' && p[1])\r
- {\r
- char *arg = argv[i + 1];\r
- switch (p[1])\r
- {\r
- case 'p': if (arg) port = atoi( arg ), i++; break;\r
- case 'P': if (arg) path = arg, i++; break;\r
- case 's': if (arg) delay_between_events = atoi( arg ), i++; break;\r
- case 'e': if (arg) event_code = atoi( arg ), i++; break;\r
- case 'd': if (arg) duration_in_seconds = atoi( arg ), i++; break;\r
- case 'h':\r
- {\r
- if (arg)\r
- {\r
- host = arg;\r
- char target[256];\r
- sprintf( target, "%s:%d", host, port );\r
- ret += fce_add_udp_socket( target );\r
- i++;\r
- }\r
- break;\r
- } \r
- }\r
+ while ((c = getopt(argc, argv, "d:e:h:p:P:s:")) != -1) {\r
+ switch(c) {\r
+ case '?':\r
+ fprintf(stdout, "%s: [ -p Port -h Listener1 [ -h Listener2 ...] -P path -s Delay_between_events_in_us -e event_code -d Duration ]\n", argv[0]);\r
+ exit(1);\r
+ break;\r
+ case 'd':\r
+ duration_in_seconds = atoi(optarg);\r
+ break;\r
+ case 'e':\r
+ event_code = atoi(optarg);\r
+ break;\r
+ case 'h':\r
+ host = strdup(optarg);\r
+ break;\r
+ case 'p':\r
+ port = strdup(optarg);\r
+ break;\r
+ case 'P':\r
+ path = strdup(optarg);\r
+ break;\r
+ case 's':\r
+ delay_between_events = atoi(optarg);\r
+ break;\r
}\r
}\r
- \r
-\r
- if (host == NULL)\r
- {\r
- char target[256];\r
- sprintf( target, "127.0.0.1:%d", port );\r
- ret += fce_add_udp_socket( target );\r
- }\r
-\r
- if (ret)\r
- return ret;\r
\r
+ sprintf(target, "%s:%s", host, port);\r
+ if (fce_add_udp_socket(target) != 0)\r
+ return 1;\r
\r
int ev_cnt = 0;\r
time_t start_time = time(NULL);\r
if (end_time && now >= end_time)\r
break;\r
\r
- register_fce( path, event_code );\r
+ register_fce( path, 0, event_code );\r
ev_cnt++;\r
\r
\r
projects / netatalk.git / blobdiff