farrokhi/fsipd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-Update TODO

Browse Source 
- Fix indenting
This commit is contained in:
Babak Farrokhi 2015-10-31 12:53:53 +03:30
parent 988d46ae37
commit 5bdb4b048c
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO.md
View File

@ -1,2 +1,3 @@
* ~~Add support for IPv6 (autodetect)~~ * ~~Add support for IPv6 (autodetect)~~
* Add optional syslog support
* Add command line options for IPv4/IPv6, port number, logging method, etc

20
fsipd.c
View File

@ -55,10 +55,9 @@
#define PORT 5060 #define PORT 5060
#define BACKLOG 1024 #define BACKLOG 1024
#ifndef IPV6_BINDV6ONLY /* Linux does not have IPV6_BINDV6ONLY */ #ifndef IPV6_BINDV6ONLY /* Linux does not have IPV6_BINDV6ONLY */
#define IPV6_BINDV6ONLY IPV6_V6ONLY #define IPV6_BINDV6ONLY IPV6_V6ONLY
#endif /*IPV6_BINDV6ONLY */ #endif /* IPV6_BINDV6ONLY */
/* /*
* Globals * Globals
@ -121,7 +120,7 @@ signal_handler(int sig)
switch (sig) { switch (sig) {
case SIGHUP: case SIGHUP:
log_reopen(&lfh); log_reopen(&lfh); /* necessary for log file rotation */
break; break;
case SIGINT: case SIGINT:
case SIGTERM: case SIGTERM:
@ -163,6 +162,7 @@ process_request(int af, struct sockaddr *src, int proto, char *str)
chomp(str); chomp(str);
/* todo: add optional syslog support */
#ifdef PF_INET6 #ifdef PF_INET6
switch (af) { switch (af) {
case AF_INET6: case AF_INET6:
@ -177,8 +177,8 @@ process_request(int af, struct sockaddr *src, int proto, char *str)
break; break;
} }
#else #else
s_in = (struct sockaddr_in *)src; s_in = (struct sockaddr_in *)src;
log_printf(lfh, "%ld,%s4,%s,%d,\"%s\"", time(NULL), pname, inet_ntoa(s_in->sin_addr), ntohs(s_in->sin_port), str); log_printf(lfh, "%ld,%s4,%s,%d,\"%s\"", time(NULL), pname, inet_ntoa(s_in->sin_addr), ntohs(s_in->sin_port), str);
#endif #endif
} }
@ -201,8 +201,8 @@ init_tcp()
perror("tcp6 socket()"); perror("tcp6 socket()");
return (EXIT_FAILURE); return (EXIT_FAILURE);
} }
int on = 1; int on = 1;
setsockopt(t6_sockfd, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof(on)); setsockopt(t6_sockfd, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof(on));
if (bind(t6_sockfd, (struct sockaddr *)&t6_sa, sizeof(t6_sa)) < 0) { if (bind(t6_sockfd, (struct sockaddr *)&t6_sa, sizeof(t6_sa)) < 0) {
@ -246,8 +246,8 @@ init_udp()
perror("udp6 socket()"); perror("udp6 socket()");
return (EXIT_FAILURE); return (EXIT_FAILURE);
} }
int on = 1; int on = 1;
setsockopt(u6_sockfd, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof(on)); setsockopt(u6_sockfd, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof(on));
if (bind(u6_sockfd, (struct sockaddr *)&u6_sa, sizeof(u6_sa)) < 0) { if (bind(u6_sockfd, (struct sockaddr *)&u6_sa, sizeof(u6_sa)) < 0) {
@ -269,7 +269,6 @@ init_udp()
perror("udp4 bind()"); perror("udp4 bind()");
return (EXIT_FAILURE); return (EXIT_FAILURE);
} }
return (EXIT_SUCCESS); return (EXIT_SUCCESS);
} }
@ -369,7 +368,7 @@ udp6_handler(void *args)
return (args); /* suppress compiler warning */ return (args); /* suppress compiler warning */
} }
#endif /* PF_INET6 */ #endif /* PF_INET6 */
/* /*
* Daemonize and persist pid * Daemonize and persist pid
@ -397,7 +396,6 @@ daemon_start()
if ((lfh = log_open("fsipd.log", 0644)) == NULL) { if ((lfh = log_open("fsipd.log", 0644)) == NULL) {
err(EXIT_FAILURE, "Cannot open log file"); err(EXIT_FAILURE, "Cannot open log file");
} }
/* Initialize TCP46 and UDP46 sockets */ /* Initialize TCP46 and UDP46 sockets */
if (init_tcp() == EXIT_FAILURE) if (init_tcp() == EXIT_FAILURE)
return (EXIT_FAILURE); return (EXIT_FAILURE);

4
logfile.c
View File

@ -30,7 +30,7 @@
#define _PROGNAME program_invocation_short_name #define _PROGNAME program_invocation_short_name
#else #else
#define _PROGNAME getprogname() #define _PROGNAME getprogname()
#endif /* __linux__ */ #endif /* __linux__ */
log_t * log_t *
log_open(const char *path, mode_t mode) log_open(const char *path, mode_t mode)
@ -52,7 +52,7 @@ log_open(const char *path, mode_t mode)
*/ */
if ((fd = open(filename, O_WRONLY | O_APPEND | O_CREAT | O_SYNC, mode)) == -1) if ((fd = open(filename, O_WRONLY | O_APPEND | O_CREAT | O_SYNC, mode)) == -1)
return (NULL); return (NULL);
if (flock(fd, LOCK_EX) == -1 ) { if (flock(fd, LOCK_EX) == -1) {
close(fd); close(fd);
return (NULL); return (NULL);
} }