Merge branch 'master' into samesversion

[l2tpns.git] / util.h

diff --git a/util.h b/util.h
index be797f8..2345860 100644 (file)
--- a/util.h
+++ b/util.h
@@ -1,6 +1,14 @@
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
 #ifndef __UTIL_H__
 #define __UTIL_H__
 

-char *inet_toa(unsigned long addr);
+char *fmtaddr(in_addr_t addr, int n);
+char *fmtMacAddr(uint8_t *pMacAddr);
+void *shared_malloc(unsigned int size);
+pid_t fork_and_close(void);
+ssize_t sendtofrom(int s, void const *buf, size_t len, int flags,
+    struct sockaddr const *to, socklen_t tolen, struct in_addr const *from);
+
+ssize_t recvfromto(int s, void *buf, size_t len, int flags,
+    struct sockaddr *from, socklen_t *fromlen, struct in_addr *toaddr);

 
 #endif /* __UTIL_H__ */
 
 #endif /* __UTIL_H__ */