|
@@ -1,6 +1,6 @@
|
|
|
Index: Makefile.defs
|
|
Index: Makefile.defs
|
|
|
--- Makefile.defs.orig 2007-08-16 16:23:20 +0200
|
|
--- Makefile.defs.orig 2007-08-16 16:23:20 +0200
|
|
|
-+++ Makefile.defs 2007-11-12 08:39:32 +0100
|
|
|
|
|
|
|
++++ Makefile.defs 2007-11-24 19:39:03 +0100
|
|
|
@@ -983,6 +983,8 @@
|
|
@@ -983,6 +983,8 @@
|
|
|
|
|
|
|
|
endif #mode=release
|
|
endif #mode=release
|
|
@@ -23,7 +23,7 @@ Index: Makefile.defs
|
|
|
ifneq ($(found_lock_method), yes)
|
|
ifneq ($(found_lock_method), yes)
|
|
|
Index: modules/permissions/parse_config.c
|
|
Index: modules/permissions/parse_config.c
|
|
|
--- modules/permissions/parse_config.c.orig 2007-08-16 16:22:57 +0200
|
|
--- modules/permissions/parse_config.c.orig 2007-08-16 16:22:57 +0200
|
|
|
-+++ modules/permissions/parse_config.c 2007-11-12 08:39:32 +0100
|
|
|
|
|
|
|
++++ modules/permissions/parse_config.c 2007-11-24 19:39:03 +0100
|
|
|
@@ -114,8 +114,11 @@
|
|
@@ -114,8 +114,11 @@
|
|
|
except = strstr(str, " EXCEPT ");
|
|
except = strstr(str, " EXCEPT ");
|
|
|
if (except) {
|
|
if (except) {
|
|
@@ -49,8 +49,8 @@ Index: modules/permissions/parse_config.c
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Index: rtpproxy/main.c
|
|
Index: rtpproxy/main.c
|
|
|
---- rtpproxy/main.c.orig 2007-11-12 03:17:02 +0100
|
|
|
|
|
-+++ rtpproxy/main.c 2007-11-12 08:43:47 +0100
|
|
|
|
|
|
|
+--- rtpproxy/main.c.orig 2007-11-23 11:17:02 +0100
|
|
|
|
|
++++ rtpproxy/main.c 2007-11-24 19:39:55 +0100
|
|
|
@@ -40,7 +40,7 @@
|
|
@@ -40,7 +40,7 @@
|
|
|
#include <sys/select.h>
|
|
#include <sys/select.h>
|
|
|
#include <sys/stat.h>
|
|
#include <sys/stat.h>
|
|
@@ -60,7 +60,7 @@ Index: rtpproxy/main.c
|
|
|
#include <err.h>
|
|
#include <err.h>
|
|
|
#endif
|
|
#endif
|
|
|
#include <errno.h>
|
|
#include <errno.h>
|
|
|
-@@ -139,7 +139,11 @@
|
|
|
|
|
|
|
+@@ -113,7 +113,11 @@
|
|
|
bindhost = NULL;
|
|
bindhost = NULL;
|
|
|
|
|
|
|
|
if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0)
|
|
if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0)
|
|
@@ -72,9 +72,9 @@ Index: rtpproxy/main.c
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
static void
|
|
|
-@@ -399,10 +403,9 @@
|
|
|
|
|
|
|
+@@ -371,10 +375,9 @@
|
|
|
|
|
|
|
|
- rtpp_log_write(RTPP_LOG_DBUG, glog, "received command \"%s\"", buf);
|
|
|
|
|
|
|
+ rtpp_log_write(RTPP_LOG_DBUG, cf->glog, "received command \"%s\"", buf);
|
|
|
|
|
|
|
|
- cp = buf;
|
|
- cp = buf;
|
|
|
argc = 0;
|
|
argc = 0;
|
|
@@ -84,10 +84,10 @@ Index: rtpproxy/main.c
|
|
|
if (**ap != '\0') {
|
|
if (**ap != '\0') {
|
|
|
argc++;
|
|
argc++;
|
|
|
if (++ap >= &argv[10])
|
|
if (++ap >= &argv[10])
|
|
|
-@@ -660,7 +663,11 @@
|
|
|
|
|
|
|
+@@ -651,7 +654,11 @@
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- rtpp_log_write(RTPP_LOG_ERR, glog, "getaddrinfo: %s",
|
|
|
|
|
|
|
+ rtpp_log_write(RTPP_LOG_ERR, cf->glog, "getaddrinfo: %s",
|
|
|
+#if defined(__sun__)
|
|
+#if defined(__sun__)
|
|
|
+ "unknown");
|
|
+ "unknown");
|
|
|
+#else
|
|
+#else
|
|
@@ -96,7 +96,7 @@ Index: rtpproxy/main.c
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-@@ -1181,7 +1188,7 @@
|
|
|
|
|
|
|
+@@ -1222,7 +1229,7 @@
|
|
|
if (cf->umode == 0) {
|
|
if (cf->umode == 0) {
|
|
|
unlink(cmd_sock);
|
|
unlink(cmd_sock);
|
|
|
memset(&ifsun, '\0', sizeof ifsun);
|
|
memset(&ifsun, '\0', sizeof ifsun);
|
|
@@ -105,7 +105,7 @@ Index: rtpproxy/main.c
|
|
|
ifsun.sun_len = strlen(cmd_sock);
|
|
ifsun.sun_len = strlen(cmd_sock);
|
|
|
#endif
|
|
#endif
|
|
|
ifsun.sun_family = AF_LOCAL;
|
|
ifsun.sun_family = AF_LOCAL;
|
|
|
-@@ -1483,7 +1490,7 @@
|
|
|
|
|
|
|
+@@ -1537,7 +1544,7 @@
|
|
|
|
|
|
|
|
controlfd = init_controlfd(&cf);
|
|
controlfd = init_controlfd(&cf);
|
|
|
|
|
|
|
@@ -116,7 +116,7 @@ Index: rtpproxy/main.c
|
|
|
err(1, "can't switch into daemon mode");
|
|
err(1, "can't switch into daemon mode");
|
|
|
Index: rtpproxy/rtpp_util.h
|
|
Index: rtpproxy/rtpp_util.h
|
|
|
--- rtpproxy/rtpp_util.h.orig 2007-07-28 10:17:02 +0200
|
|
--- rtpproxy/rtpp_util.h.orig 2007-07-28 10:17:02 +0200
|
|
|
-+++ rtpproxy/rtpp_util.h 2007-11-12 08:39:32 +0100
|
|
|
|
|
|
|
++++ rtpproxy/rtpp_util.h 2007-11-24 19:39:03 +0100
|
|
|
@@ -84,7 +84,7 @@
|
|
@@ -84,7 +84,7 @@
|
|
|
#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
|
|
#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
|
|
|
#endif
|
|
#endif
|