From 4d09442efcd8c158999685831720919a705f3d98 Mon Sep 17 00:00:00 2001 From: Lars Heer Date: Wed, 18 Sep 2013 05:59:02 +0200 Subject: removed obsolete .svn directories --- mcast/.svn/entries | 40 - mcast/client/.svn/entries | 1357 -------------------- .../client/.svn/prop-base/api_shm_test.c.svn-base | 5 - .../client/.svn/prop-base/api_sock_test.c.svn-base | 5 - mcast/client/.svn/prop-base/ciparser.c.svn-base | 5 - mcast/client/.svn/prop-base/inet_aton.c.svn-base | 5 - mcast/client/.svn/prop-base/inet_ntop.c.svn-base | 5 - mcast/client/.svn/prop-base/inet_pton.c.svn-base | 5 - mcast/client/.svn/prop-base/interfaces.c.svn-base | 5 - mcast/client/.svn/prop-base/mcast.c.svn-base | 5 - mcast/client/.svn/prop-base/mld_client.c.svn-base | 5 - mcast/client/.svn/prop-base/mld_common.c.svn-base | 5 - mcast/client/.svn/prop-base/recv_ccpp.c.svn-base | 5 - mcast/client/.svn/prop-base/tools.c.svn-base | 5 - mcast/client/.svn/prop-base/win32.svn-base | 5 - mcast/client/.svn/text-base/.indent.pro.svn-base | 1 - mcast/client/.svn/text-base/Makefile.svn-base | 210 --- mcast/client/.svn/text-base/api_server.c.svn-base | 397 ------ mcast/client/.svn/text-base/api_server.h.svn-base | 67 - .../client/.svn/text-base/api_shm_test.c.svn-base | 1 - .../client/.svn/text-base/api_sock_test.c.svn-base | 1 - mcast/client/.svn/text-base/api_test.c.svn-base | 127 -- mcast/client/.svn/text-base/ci_handler.c.svn-base | 321 ----- mcast/client/.svn/text-base/ci_handler.h.svn-base | 30 - mcast/client/.svn/text-base/ciparser.c.svn-base | 1 - .../client/.svn/text-base/dummy_client.c.svn-base | 101 -- .../client/.svn/text-base/dummy_client.h.svn-base | 10 - .../client/.svn/text-base/dvblo_handler.c.svn-base | 716 ----------- .../client/.svn/text-base/dvblo_handler.h.svn-base | 40 - mcast/client/.svn/text-base/headers.h.svn-base | 32 - mcast/client/.svn/text-base/inet_aton.c.svn-base | 1 - mcast/client/.svn/text-base/inet_ntop.c.svn-base | 1 - mcast/client/.svn/text-base/inet_pton.c.svn-base | 1 - mcast/client/.svn/text-base/input.c.svn-base | 145 --- mcast/client/.svn/text-base/interfaces.c.svn-base | 1 - mcast/client/.svn/text-base/main.c.svn-base | 83 -- mcast/client/.svn/text-base/mcast.c.svn-base | 1 - mcast/client/.svn/text-base/mld_client.c.svn-base | 1 - mcast/client/.svn/text-base/mld_common.c.svn-base | 1 - .../client/.svn/text-base/mld_reporter.c.svn-base | 225 ---- .../client/.svn/text-base/mld_reporter.h.svn-base | 11 - mcast/client/.svn/text-base/mmi_handler.c.svn-base | 336 ----- mcast/client/.svn/text-base/mmi_handler.h.svn-base | 46 - mcast/client/.svn/text-base/recv_ccpp.c.svn-base | 1 - mcast/client/.svn/text-base/recv_tv.c.svn-base | 905 ------------- mcast/client/.svn/text-base/recv_tv.h.svn-base | 96 -- mcast/client/.svn/text-base/satlists.c.svn-base | 133 -- mcast/client/.svn/text-base/sock_test.c.svn-base | 93 -- mcast/client/.svn/text-base/tca_handler.c.svn-base | 84 -- mcast/client/.svn/text-base/tca_handler.h.svn-base | 18 - mcast/client/.svn/text-base/tools.c.svn-base | 1 - mcast/client/.svn/text-base/tra_handler.c.svn-base | 56 - mcast/client/.svn/text-base/tra_handler.h.svn-base | 10 - mcast/client/.svn/text-base/win32.svn-base | 1 - mcast/client/mingw/.svn/entries | 96 -- .../client/mingw/.svn/text-base/Makefile.svn-base | 55 - .../client/mingw/.svn/text-base/build.cmd.svn-base | 2 - mcast/common/.svn/entries | 847 ------------ mcast/common/.svn/text-base/.indent.pro.svn-base | 1 - mcast/common/.svn/text-base/ciparser.c.svn-base | 702 ---------- mcast/common/.svn/text-base/ciparser.h.svn-base | 140 -- mcast/common/.svn/text-base/crc32.c.svn-base | 88 -- mcast/common/.svn/text-base/crc32.h.svn-base | 35 - mcast/common/.svn/text-base/defs.h.svn-base | 389 ------ .../.svn/text-base/dvb_ca_wrapper.h.svn-base | 18 - mcast/common/.svn/text-base/input.h.svn-base | 38 - mcast/common/.svn/text-base/interfaces.c.svn-base | 347 ----- mcast/common/.svn/text-base/interfaces.h.svn-base | 52 - mcast/common/.svn/text-base/list.h.svn-base | 238 ---- mcast/common/.svn/text-base/mcast.c.svn-base | 674 ---------- mcast/common/.svn/text-base/mcast.h.svn-base | 64 - mcast/common/.svn/text-base/mld.h.svn-base | 339 ----- mcast/common/.svn/text-base/mld_client.c.svn-base | 244 ---- mcast/common/.svn/text-base/mld_common.c.svn-base | 243 ---- mcast/common/.svn/text-base/recv_ccpp.c.svn-base | 1333 ------------------- mcast/common/.svn/text-base/recv_ccpp.h.svn-base | 129 -- mcast/common/.svn/text-base/satlists.h.svn-base | 92 -- mcast/common/.svn/text-base/siparser.c.svn-base | 1049 --------------- mcast/common/.svn/text-base/siparser.h.svn-base | 369 ------ mcast/common/.svn/text-base/tools.c.svn-base | 777 ----------- mcast/common/.svn/text-base/tools.h.svn-base | 108 -- mcast/common/.svn/text-base/version.h.svn-base | 18 - mcast/common/darwin/.svn/entries | 31 - mcast/common/darwin/include/.svn/entries | 62 - .../darwin/include/.svn/prop-base/linux.svn-base | 5 - .../darwin/include/.svn/text-base/linux.svn-base | 1 - mcast/dvbloop/.svn/entries | 266 ---- mcast/dvbloop/.svn/text-base/dvblo.h.svn-base | 58 - mcast/dvbloop/.svn/text-base/dvblo_adap.h.svn-base | 155 --- .../.svn/text-base/dvblo_adap_ca.h.svn-base | 43 - .../.svn/text-base/dvblo_adap_fe.h.svn-base | 30 - mcast/dvbloop/.svn/text-base/dvblo_char.h.svn-base | 33 - .../dvbloop/.svn/text-base/dvblo_ioctl.h.svn-base | 203 --- mcast/dvbloop/.svn/text-base/dvblo_util.h.svn-base | 45 - mcast/tool/.svn/entries | 232 ---- mcast/tool/.svn/prop-base/mcast.c.svn-base | 5 - mcast/tool/.svn/prop-base/tools.c.svn-base | 5 - mcast/tool/.svn/text-base/Makefile.svn-base | 137 -- mcast/tool/.svn/text-base/mcast.c.svn-base | 1 - mcast/tool/.svn/text-base/netcvdiag.c.svn-base | 433 ------- mcast/tool/.svn/text-base/netcvlogview.c.svn-base | 206 --- mcast/tool/.svn/text-base/netcvupdate.c.svn-base | 773 ----------- mcast/tool/.svn/text-base/tools.c.svn-base | 1 - 103 files changed, 16980 deletions(-) delete mode 100644 mcast/.svn/entries delete mode 100644 mcast/client/.svn/entries delete mode 100644 mcast/client/.svn/prop-base/api_shm_test.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/api_sock_test.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/ciparser.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/inet_aton.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/inet_ntop.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/inet_pton.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/interfaces.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/mcast.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/mld_client.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/mld_common.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/recv_ccpp.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/tools.c.svn-base delete mode 100644 mcast/client/.svn/prop-base/win32.svn-base delete mode 100644 mcast/client/.svn/text-base/.indent.pro.svn-base delete mode 100644 mcast/client/.svn/text-base/Makefile.svn-base delete mode 100644 mcast/client/.svn/text-base/api_server.c.svn-base delete mode 100644 mcast/client/.svn/text-base/api_server.h.svn-base delete mode 100644 mcast/client/.svn/text-base/api_shm_test.c.svn-base delete mode 100644 mcast/client/.svn/text-base/api_sock_test.c.svn-base delete mode 100644 mcast/client/.svn/text-base/api_test.c.svn-base delete mode 100644 mcast/client/.svn/text-base/ci_handler.c.svn-base delete mode 100644 mcast/client/.svn/text-base/ci_handler.h.svn-base delete mode 100644 mcast/client/.svn/text-base/ciparser.c.svn-base delete mode 100644 mcast/client/.svn/text-base/dummy_client.c.svn-base delete mode 100644 mcast/client/.svn/text-base/dummy_client.h.svn-base delete mode 100644 mcast/client/.svn/text-base/dvblo_handler.c.svn-base delete mode 100644 mcast/client/.svn/text-base/dvblo_handler.h.svn-base delete mode 100644 mcast/client/.svn/text-base/headers.h.svn-base delete mode 100644 mcast/client/.svn/text-base/inet_aton.c.svn-base delete mode 100644 mcast/client/.svn/text-base/inet_ntop.c.svn-base delete mode 100644 mcast/client/.svn/text-base/inet_pton.c.svn-base delete mode 100644 mcast/client/.svn/text-base/input.c.svn-base delete mode 100644 mcast/client/.svn/text-base/interfaces.c.svn-base delete mode 100644 mcast/client/.svn/text-base/main.c.svn-base delete mode 100644 mcast/client/.svn/text-base/mcast.c.svn-base delete mode 100644 mcast/client/.svn/text-base/mld_client.c.svn-base delete mode 100644 mcast/client/.svn/text-base/mld_common.c.svn-base delete mode 100644 mcast/client/.svn/text-base/mld_reporter.c.svn-base delete mode 100644 mcast/client/.svn/text-base/mld_reporter.h.svn-base delete mode 100644 mcast/client/.svn/text-base/mmi_handler.c.svn-base delete mode 100644 mcast/client/.svn/text-base/mmi_handler.h.svn-base delete mode 100644 mcast/client/.svn/text-base/recv_ccpp.c.svn-base delete mode 100644 mcast/client/.svn/text-base/recv_tv.c.svn-base delete mode 100644 mcast/client/.svn/text-base/recv_tv.h.svn-base delete mode 100644 mcast/client/.svn/text-base/satlists.c.svn-base delete mode 100644 mcast/client/.svn/text-base/sock_test.c.svn-base delete mode 100644 mcast/client/.svn/text-base/tca_handler.c.svn-base delete mode 100644 mcast/client/.svn/text-base/tca_handler.h.svn-base delete mode 100644 mcast/client/.svn/text-base/tools.c.svn-base delete mode 100644 mcast/client/.svn/text-base/tra_handler.c.svn-base delete mode 100644 mcast/client/.svn/text-base/tra_handler.h.svn-base delete mode 100644 mcast/client/.svn/text-base/win32.svn-base delete mode 100644 mcast/client/mingw/.svn/entries delete mode 100644 mcast/client/mingw/.svn/text-base/Makefile.svn-base delete mode 100644 mcast/client/mingw/.svn/text-base/build.cmd.svn-base delete mode 100644 mcast/common/.svn/entries delete mode 100644 mcast/common/.svn/text-base/.indent.pro.svn-base delete mode 100644 mcast/common/.svn/text-base/ciparser.c.svn-base delete mode 100644 mcast/common/.svn/text-base/ciparser.h.svn-base delete mode 100644 mcast/common/.svn/text-base/crc32.c.svn-base delete mode 100644 mcast/common/.svn/text-base/crc32.h.svn-base delete mode 100644 mcast/common/.svn/text-base/defs.h.svn-base delete mode 100644 mcast/common/.svn/text-base/dvb_ca_wrapper.h.svn-base delete mode 100644 mcast/common/.svn/text-base/input.h.svn-base delete mode 100644 mcast/common/.svn/text-base/interfaces.c.svn-base delete mode 100644 mcast/common/.svn/text-base/interfaces.h.svn-base delete mode 100644 mcast/common/.svn/text-base/list.h.svn-base delete mode 100644 mcast/common/.svn/text-base/mcast.c.svn-base delete mode 100644 mcast/common/.svn/text-base/mcast.h.svn-base delete mode 100644 mcast/common/.svn/text-base/mld.h.svn-base delete mode 100644 mcast/common/.svn/text-base/mld_client.c.svn-base delete mode 100644 mcast/common/.svn/text-base/mld_common.c.svn-base delete mode 100644 mcast/common/.svn/text-base/recv_ccpp.c.svn-base delete mode 100644 mcast/common/.svn/text-base/recv_ccpp.h.svn-base delete mode 100644 mcast/common/.svn/text-base/satlists.h.svn-base delete mode 100644 mcast/common/.svn/text-base/siparser.c.svn-base delete mode 100644 mcast/common/.svn/text-base/siparser.h.svn-base delete mode 100644 mcast/common/.svn/text-base/tools.c.svn-base delete mode 100644 mcast/common/.svn/text-base/tools.h.svn-base delete mode 100644 mcast/common/.svn/text-base/version.h.svn-base delete mode 100644 mcast/common/darwin/.svn/entries delete mode 100644 mcast/common/darwin/include/.svn/entries delete mode 100644 mcast/common/darwin/include/.svn/prop-base/linux.svn-base delete mode 100644 mcast/common/darwin/include/.svn/text-base/linux.svn-base delete mode 100644 mcast/dvbloop/.svn/entries delete mode 100644 mcast/dvbloop/.svn/text-base/dvblo.h.svn-base delete mode 100644 mcast/dvbloop/.svn/text-base/dvblo_adap.h.svn-base delete mode 100644 mcast/dvbloop/.svn/text-base/dvblo_adap_ca.h.svn-base delete mode 100644 mcast/dvbloop/.svn/text-base/dvblo_adap_fe.h.svn-base delete mode 100644 mcast/dvbloop/.svn/text-base/dvblo_char.h.svn-base delete mode 100644 mcast/dvbloop/.svn/text-base/dvblo_ioctl.h.svn-base delete mode 100644 mcast/dvbloop/.svn/text-base/dvblo_util.h.svn-base delete mode 100644 mcast/tool/.svn/entries delete mode 100644 mcast/tool/.svn/prop-base/mcast.c.svn-base delete mode 100644 mcast/tool/.svn/prop-base/tools.c.svn-base delete mode 100644 mcast/tool/.svn/text-base/Makefile.svn-base delete mode 100644 mcast/tool/.svn/text-base/mcast.c.svn-base delete mode 100644 mcast/tool/.svn/text-base/netcvdiag.c.svn-base delete mode 100644 mcast/tool/.svn/text-base/netcvlogview.c.svn-base delete mode 100644 mcast/tool/.svn/text-base/netcvupdate.c.svn-base delete mode 100644 mcast/tool/.svn/text-base/tools.c.svn-base (limited to 'mcast') diff --git a/mcast/.svn/entries b/mcast/.svn/entries deleted file mode 100644 index 2fee7ce..0000000 --- a/mcast/.svn/entries +++ /dev/null @@ -1,40 +0,0 @@ -10 - -dir -18963 -svn://reelbox.org/testing/src/vdr-plugins/src/mcli-1/mcast -svn://reelbox.org - - - -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - -12be777f-adf9-0310-842f-e37ecc4c7426 - -tool -dir - -client -dir - -dvbloop -dir - -common -dir - diff --git a/mcast/client/.svn/entries b/mcast/client/.svn/entries deleted file mode 100644 index 11f10fe..0000000 --- a/mcast/client/.svn/entries +++ /dev/null @@ -1,1357 +0,0 @@ -10 - -dir -18963 -svn://reelbox.org/testing/src/vdr-plugins/src/mcli-1/mcast/client -svn://reelbox.org - - - -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - -12be777f-adf9-0310-842f-e37ecc4c7426 - -dvblo_handler.c -file - - - - -2012-09-27T17:22:49.690848Z -c4b6b1eb8cd3a18164b5e331f0a38e66 -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - - - - - - - - -20024 - -recv_ccpp.c -file - - - - -2012-09-27T17:22:49.690848Z -5f878ec9ebd38288cfcc82ee5020c35f -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -21 - -api_server.h -file - - - - -2012-09-27T17:22:49.690848Z -b8b3a949bf3dd399db5549c95421ddcb -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -1357 - -tca_handler.c -file - - - - -2012-09-27T17:22:49.690848Z -2b508aed689369915aa2901edb11ac20 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -1840 - -satlists.c -file - - - - -2012-09-27T17:22:49.690848Z -d3b50554e8c693cfd4af919fad07fbc0 -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - - - - - - - - -5049 - -api_test.c -file - - - - -2012-09-27T17:22:49.690848Z -fce170fc6462af495657d8669b043b41 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -4459 - -dvblo_handler.h -file - - - - -2012-09-27T17:22:49.690848Z -9adb433e99e33b9e2d694ff475b740de -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -743 - -tca_handler.h -file - - - - -2012-09-27T17:22:49.690848Z -3a3b79eee5e1dba852b69f2000a3ccee -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -405 - -mld_client.c -file - - - - -2012-09-27T17:22:49.690848Z -e05bdc7ebc621c510360568867dfdecf -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -22 - -.indent.pro -file - - - - -2012-09-27T17:22:49.690848Z -536d6397e801893325c24ec292dee74f -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -22 - -mmi_handler.c -file - - - - -2012-09-27T17:22:49.690848Z -f85ea2246efdb5607ee9a20366bfcd51 -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - - - - - - - - -9851 - -inet_aton.c -file - - - - -2012-09-27T17:22:49.690848Z -48b37f322a2ae164aa3fb4204c83f6a3 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -27 - -headers.h -file - - - - -2012-09-27T17:22:49.690848Z -aeaf120e1dfc0892b0c49cdf722c9fef -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -638 - -interfaces.c -file - - - - -2012-09-27T17:22:49.690848Z -bd70360e68db12e0e2fe335bc92ad0e3 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -22 - -mmi_handler.h -file - - - - -2012-09-27T17:22:49.690848Z -ed868ea810d05d4fe0ea795cad357faa -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -1225 - -ci_handler.c -file - - - - -2012-09-27T17:22:49.690848Z -d8f14df45e26ee759bb661076b00df2f -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - - - - - - - - -8218 - -dummy_client.c -file - - - - -2012-09-27T17:22:49.690848Z -c109d8ba8e2dec6b0b5b519c605148f5 -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - - - - - - - - -2677 - -Makefile -file - - - - -2012-09-27T17:22:49.690848Z -ece098cc6788e85c17ce068287a98921 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -4977 - -ci_handler.h -file - - - - -2012-09-27T17:22:49.690848Z -fefcc7f7895850402b2326d8801c41c7 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -859 - -dummy_client.h -file - - - - -2012-09-27T17:22:49.690848Z -1d353edb3158ed94c160c71b499b6591 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -180 - -mld_reporter.c -file - - - - -2012-09-27T17:22:49.690848Z -e3965ad4570cff659778eec00fbb7e4c -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - - - - - - - - -6670 - -input.c -file - - - - -2012-09-27T17:22:49.694848Z -d1e761e12f3e1dec2a559289cb35cde8 -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - - - - - - - - -3730 - -tools.c -file - - - - -2012-09-27T17:22:49.694848Z -c0906e8f658e6d84d4e12dca1e3ffc57 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -17 - -mingw -dir - -mld_reporter.h -file - - - - -2012-09-27T17:22:49.694848Z -d2eab4a0ce39c3aa79acf912f5bdf7ae -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -239 - -mcast.c -file - - - - -2012-09-27T17:22:49.694848Z -b6c289caaedfc9f9a24d597c72a5d8ce -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -17 - -recv_tv.c -file - - - - -2012-09-27T17:22:49.694848Z -e7bafc54679736def7ce798acacea0e7 -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - - - - - - - - -25663 - -ciparser.c -file - - - - -2012-09-27T17:22:49.694848Z -0cc85089fb87cd0fd0e240e4163510ae -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -20 - -recv_tv.h -file - - - - -2012-09-27T17:22:49.694848Z -e270bffd77d17ca32d976a57be19ea2c -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -2396 - -api_shm_test.c -file - - - - -2012-09-27T17:22:49.694848Z -3be100d9064c5186f90d3efe17ae5e0a -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -10 - -win32 -file - - - - -2012-09-27T17:22:49.694848Z -7e2c1fbd0a7ddc76a7a55f662d59e6e3 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -15 - -tra_handler.c -file - - - - -2012-09-27T17:22:49.694848Z -720a9b9450e8d072850a8632f9efb3bc -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -1121 - -mld_common.c -file - - - - -2012-09-27T17:22:49.694848Z -d0224283be18ec0774fb34c10667634a -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -22 - -main.c -file - - - - -2012-09-27T17:22:49.694848Z -f1a5585bbe9a3711ad03bc10cb2def5a -2011-08-18T10:09:14.813360Z -17158 -dirk - - - - - - - - - - - - - - - - - - - - - -1599 - -api_sock_test.c -file - - - - -2012-09-27T17:22:49.694848Z -3be100d9064c5186f90d3efe17ae5e0a -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -10 - -tra_handler.h -file - - - - -2012-09-27T17:22:49.694848Z -694293ed706ea26dc96111413def41d4 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -234 - -sock_test.c -file - - - - -2012-09-27T17:22:49.686848Z -7d714bc587133294a02cb2edf0e6a841 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -2911 - -inet_pton.c -file - - - - -2012-09-27T17:22:49.686848Z -935bd6f5bff2d3724e7e1913bf6f0b81 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -27 - -inet_ntop.c -file - - - - -2012-09-27T17:22:49.690848Z -04380ba6685b175467f790aba9963a01 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster -has-props - - -svn:special - - - - - - - - - - - - - - - - - -27 - -api_server.c -file - - - - -2012-09-27T17:22:49.690848Z -853f06ad8aec7ec15e6fda43b1f66a77 -2011-07-12T13:36:23.313379Z -16905 -rollercoaster - - - - - - - - - - - - - - - - - - - - - -10766 - diff --git a/mcast/client/.svn/prop-base/api_shm_test.c.svn-base b/mcast/client/.svn/prop-base/api_shm_test.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/api_shm_test.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/api_sock_test.c.svn-base b/mcast/client/.svn/prop-base/api_sock_test.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/api_sock_test.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/ciparser.c.svn-base b/mcast/client/.svn/prop-base/ciparser.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/ciparser.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/inet_aton.c.svn-base b/mcast/client/.svn/prop-base/inet_aton.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/inet_aton.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/inet_ntop.c.svn-base b/mcast/client/.svn/prop-base/inet_ntop.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/inet_ntop.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/inet_pton.c.svn-base b/mcast/client/.svn/prop-base/inet_pton.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/inet_pton.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/interfaces.c.svn-base b/mcast/client/.svn/prop-base/interfaces.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/interfaces.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/mcast.c.svn-base b/mcast/client/.svn/prop-base/mcast.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/mcast.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/mld_client.c.svn-base b/mcast/client/.svn/prop-base/mld_client.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/mld_client.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/mld_common.c.svn-base b/mcast/client/.svn/prop-base/mld_common.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/mld_common.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/recv_ccpp.c.svn-base b/mcast/client/.svn/prop-base/recv_ccpp.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/recv_ccpp.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/tools.c.svn-base b/mcast/client/.svn/prop-base/tools.c.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/tools.c.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/prop-base/win32.svn-base b/mcast/client/.svn/prop-base/win32.svn-base deleted file mode 100644 index d222469..0000000 --- a/mcast/client/.svn/prop-base/win32.svn-base +++ /dev/null @@ -1,5 +0,0 @@ -K 11 -svn:special -V 1 -* -END diff --git a/mcast/client/.svn/text-base/.indent.pro.svn-base b/mcast/client/.svn/text-base/.indent.pro.svn-base deleted file mode 100644 index 2faef85..0000000 --- a/mcast/client/.svn/text-base/.indent.pro.svn-base +++ /dev/null @@ -1 +0,0 @@ --i8 -br -l0 -ce -npsl diff --git a/mcast/client/.svn/text-base/Makefile.svn-base b/mcast/client/.svn/text-base/Makefile.svn-base deleted file mode 100644 index 1ea0844..0000000 --- a/mcast/client/.svn/text-base/Makefile.svn-base +++ /dev/null @@ -1,210 +0,0 @@ -#Comment this out to disable debugging output -#DEBUG=1 -#VERBOSE=1 -#WIN32=1 -#API_SOCK=1 -#VERBOSE=1 -#BACKTRACE=1 - -ifdef RBMINI - ARMEL=1 -endif - -ARCH= $(shell $(CC) -dumpmachine) -APPLE_DARWIN = $(shell echo $(ARCH) | grep -q 'apple-darwin' && echo "1" || echo "0") -CYGWIN = $(shell echo $(ARCH) | grep -q 'cygwin' && echo "1" || echo "0") -MIPSEL = $(shell echo $(ARCH) | grep -q 'mipsel' && echo "1" || echo "0") - -DEFS=-DCLIENT -DLIBRARY -D_REENTRANT -D_GNU_SOURCE - -ifeq ($(CYGWIN), 1) -WIN32=1 -else -API_SOCK=1 -endif - -ifeq ($(APPLE_DARWIN), 1) -DEFS:=$(DEFS) -I../common/darwin/include/ -DAPPLE -APPLE=1 -endif - -VDRDIR=../../../../.. --include $(VDRDIR)/Make.config - -ifdef ARMEL - XML_INC := -I/usr/arm-linux-gnueabi/include/libxml2 - XML_LIB := -lxml2 - CROSS = arm-linux-gnueabi- -else -ifeq ($(MIPSEL),1) -DEFS:=$(DEFS) -DMIPSEL -XML_INC:=-I../../libxml2/include -XML_LIB:=-L../../libxml2/lib -else -XML_INC:=`xml2-config --cflags` -XML_LIB:=`xml2-config --libs` -LIBRARY_PATH=/usr/lib -endif -endif -ifeq ($(APPLE_DARWIN), 1) -CFLAGS:= $(CFLAGS) -fPIC -fno-common -Wall -I../common $(DEFS) -else -CFLAGS:= $(CFLAGS) -fPIC -Wall -I../common $(DEFS) -endif - -ifdef BACKTRACE -CFLAGS:= $(CFLAGS) -DBACKTRACE -g -endif - -ifdef API_SHM -LDFLAGS:= $(LDFLAGS) -lrt -CFLAGS:= $(CFLAGS) -DAPI_SHM -endif -ifdef API_SOCK -CFLAGS:= $(CFLAGS) -DAPI_SOCK -endif - -ifdef VERBOSE -CFLAGS:= $(CFLAGS) -DDEBUG -DEBUG=1 -endif - -ifdef WIN32 -CFLAGS:= -Iwin32/include $(CFLAGS) -mno-cygwin -fPIC -DWIN32 -LDFLAGS:= -Lwin32/lib $(LDFLAGS) -mno-cygwin -LDLIBS:= -lpthreadGC2 -lxml2 -lz -lws2_32 -liphlpapi -else -CFLAGS:= $(CFLAGS) -I../dvbloop $(XML_INC) -LDFLAGS:=$(LDFLAGS) -LDLIBS:=$(XML_LIB) -lpthread -lz -lm -endif - -ifdef DEBUG -LDFLAGS:= $(LDFLAGS) -g -rdynamic -CFLAGS:= $(CFLAGS) -g -O0 -else -CFLAGS:= $(CFLAGS) -O3 -endif - -MCLI = mcli - -MCLI_OBJS= mld_common.o mld_client.o mld_reporter.o mcast.o recv_tv.o recv_ccpp.o tools.o tca_handler.o tra_handler.o satlists.o interfaces.o api_server.o ciparser.o ci_handler.o mmi_handler.o -ifdef WIN32 -MCLI_OBJS := $(MCLI_OBJS) inet_pton.o inet_ntop.o inet_aton.o -else -MCLI_OBJS := $(MCLI_OBJS) -endif - -MCLI_SOBJS = main.o -ifdef WIN32 -MCLI_SOBJS := $(MCLI_SOBJS) dummy_client.o -else -ifdef APPLE -MCLI_SOBJS := $(MCLI_SOBJS) dummy_client.o input.o -else -MCLI_SOBJS := $(MCLI_SOBJS) dvblo_handler.o input.o -endif -endif - -all: lib$(MCLI) - -static: $(MCLI)-static - - -MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - $(MAKEDEP) $(CFLAGS) $(MCLI_OBJS:%.o=%.c) > $@ - --include $(DEPFILE) - - -$(MCLI): $(MCLI_OBJS) $(MCLI_SOBJS) - $(CC) $(LDFLAGS) -o $@ $(MCLI_OBJS) $(MCLI_SOBJS) $(LDLIBS) -ifndef DEBUG -ifndef WIN32 - strip $(MCLI) -endif -endif - -lib$(MCLI): $(MCLI_OBJS) -ifdef WIN32 - $(CC) $(LDFLAGS) -shared -o $@.dll $(MCLI_OBJS) $(LDLIBS) -Wl,--out-implib,$@.a -Wl,--output-def,$@.def - lib /def:$@.def /machine:x86 /out:..\\common\\win32\\lib\\$@.lib -# dlltool -k --dllname $@.dll --output-lib win32/lib/$@.lib --def $@.def - cp -a $@.dll win32/lib/ - cp -a $@.a win32/lib/ - cp -a $@.def win32/lib/ -endif -ifdef APPLE - $(CC) $(LDFLAGS) -dynamiclib -o $@.dylib $(MCLI_OBJS) $(LDLIBS) - $(AR) $(ARFLAGS) $@.a $(MCLI_OBJS) -else - $(CC) $(LDFLAGS) -shared -o $@.so $(MCLI_OBJS) $(LDLIBS) - $(AR) $(ARFLAGS) $@.a $(MCLI_OBJS) -endif - - -$(MCLI)-shared: lib$(MCLI) - $(CC) -c $(CFLAGS) -ULIBRARY -o main.o main.c -ifdef WIN32 - $(CC) -c $(CFLAGS) -ULIBRARY -o dummy_client.o dummy_client.c -else -ifdef APPLE - $(CC) -c $(CFLAGS) -ULIBRARY -o input.o input.c - $(CC) -c $(CFLAGS) -ULIBRARY -o dummy_client.o dummy_client.c -else - $(CC) -c $(CFLAGS) -ULIBRARY -o input.o input.c - $(CC) -c $(CFLAGS) -ULIBRARY -o dvblo_handler.o dvblo_handler.c -endif -endif - $(CC) $(LDFLAGS) -o $@ $(MCLI_SOBJS) $(LDLIBS) -L. -lmcli - -$(MCLI)-static: $(MCLI_OBJS) $(MCLI_SOBJS) - $(CC) $(LDFLAGS) -static -static-libgcc -o $@ $(MCLI_OBJS) $(MCLI_SOBJS) $(LDLIBS) $(LIBRARY_PATH)/libxml2.a $(LIBRARY_PATH)/libz.a $(LIBRARY_PATH)/libm.a $(LIBRARY_PATH)/libpthread.a -ifndef DEBUG -ifndef WIN32 - strip $(MCLI)-static -endif -endif - -api_shm_test.o: api_shm_test.c - $(CC) -c $(CFLAGS) -DUSE_SHM_API -o $@ $< - -api_sock_test.o:api_sock_test.c - $(CC) -c $(CFLAGS) -DUSE_SOCK_API -o $@ $< - -$(MCLI)-shmtest: api_shm_test.o - $(CC) $(LDFLAGS) -o $@ api_shm_test.o $(LDLIBS) -lrt - -$(MCLI)-socktest: api_sock_test.o - $(CC) $(LDFLAGS) -o $@ api_sock_test.o - -install: mcli - install -p $< /usr/sbin/$< - -install-lib: libmcli.la - libtool --mode=install install $< /usr/local/lib/ - -install-shared: mcli-shared - libtool --mode=install install $< /usr/local/bin - -depend: .dependencies - #makedepend -Y -- $(CFLAGS) -- *c >/dev/null 2>&1 - -clean: - rm -f $(MCLI) $(MCLI)-* *.elf *.gdb *.o *.lo *.la *~ *.so *.a *.def *.dll *.dylib out.ts - -mingw32: - rm -rf mingw/*.c mingw/*.h mingw/win32 - cp *.c *.h mingw/ - mkdir mingw/win32 - cp -a win32/lib mingw/win32/ - cp -a win32/include mingw/win32/ - @echo "Created mingw directory - now ready to rumble... (call build.cmd)" - -%.o: %.c - $(CC) -c $(CFLAGS) -o $@ $< - -%.lo: %.c - $(CC) -c $(CFLAGS) -o $@ $< diff --git a/mcast/client/.svn/text-base/api_server.c.svn-base b/mcast/client/.svn/text-base/api_server.c.svn-base deleted file mode 100644 index c3d7617..0000000 --- a/mcast/client/.svn/text-base/api_server.c.svn-base +++ /dev/null @@ -1,397 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -#include "headers.h" - -#if defined(API_SOCK) || defined(API_SHM) || defined (API_WIN) - -static int process_cmd (api_cmd_t * api_cmd, tra_info_t * trl, netceiver_info_list_t * nci) -{ - if(api_cmd->magic != MCLI_MAGIC || api_cmd->version != MCLI_VERSION) { - api_cmd->magic = MCLI_MAGIC; - api_cmd->version = MCLI_VERSION; - api_cmd->state = API_RESPONSE; - return 0; - } - if (api_cmd->state != API_REQUEST) { - return 0; - } - - switch (api_cmd->cmd) { - case API_GET_NC_NUM: - api_cmd->parm[API_PARM_NC_NUM] = nci->nci_num; - api_cmd->state = API_RESPONSE; - break; - - case API_GET_NC_INFO: - if (api_cmd->parm[API_PARM_NC_NUM] < nci->nci_num) { - api_cmd->u.nc_info = nci->nci[api_cmd->parm[API_PARM_NC_NUM]]; - api_cmd->state = API_RESPONSE; - } else { - api_cmd->state = API_ERROR; - } - break; - case API_GET_TUNER_INFO: - if (api_cmd->parm[API_PARM_NC_NUM] < nci->nci_num) { - if (api_cmd->parm[API_PARM_TUNER_NUM] < nci->nci[api_cmd->parm[API_PARM_NC_NUM]].tuner_num) { - api_cmd->u.tuner_info = nci->nci[api_cmd->parm[API_PARM_NC_NUM]].tuner[api_cmd->parm[API_PARM_TUNER_NUM]]; - api_cmd->state = API_RESPONSE; - } else { - api_cmd->state = API_ERROR; - } - } else { - api_cmd->state = API_ERROR; - } - break; - case API_GET_SAT_LIST_INFO: - if (api_cmd->parm[API_PARM_NC_NUM] < nci->nci_num) { - if (api_cmd->parm[API_PARM_SAT_LIST_NUM] < nci->nci[api_cmd->parm[API_PARM_NC_NUM]].sat_list_num) { - api_cmd->u.sat_list = nci->nci[api_cmd->parm[API_PARM_NC_NUM]].sat_list[api_cmd->parm[API_PARM_SAT_LIST_NUM]]; - api_cmd->state = API_RESPONSE; - } else { - api_cmd->state = API_ERROR; - } - } else { - api_cmd->state = API_ERROR; - } - break; - case API_GET_SAT_INFO: - if (api_cmd->parm[API_PARM_NC_NUM] < nci->nci_num) { - if (api_cmd->parm[API_PARM_SAT_LIST_NUM] < nci->nci[api_cmd->parm[API_PARM_NC_NUM]].sat_list_num) { - if (api_cmd->parm[API_PARM_SAT_NUM] < nci->nci[api_cmd->parm[API_PARM_NC_NUM]].sat_list[api_cmd->parm[API_PARM_SAT_LIST_NUM]].sat_num) { - api_cmd->u.sat_info = nci->nci[api_cmd->parm[API_PARM_NC_NUM]].sat_list[api_cmd->parm[API_PARM_SAT_LIST_NUM]].sat[api_cmd->parm[API_PARM_SAT_NUM]]; - api_cmd->state = API_RESPONSE; - } else { - api_cmd->state = API_ERROR; - } - } else { - api_cmd->state = API_ERROR; - } - } else { - api_cmd->state = API_ERROR; - } - break; - - case API_GET_SAT_COMP_INFO: - if (api_cmd->parm[API_PARM_NC_NUM] < nci->nci_num) { - if (api_cmd->parm[API_PARM_SAT_LIST_NUM] < nci->nci[api_cmd->parm[API_PARM_NC_NUM]].sat_list_num) { - if (api_cmd->parm[API_PARM_SAT_NUM] < nci->nci[api_cmd->parm[API_PARM_NC_NUM]].sat_list[api_cmd->parm[API_PARM_SAT_LIST_NUM]].sat_num) { - if (api_cmd->parm[API_PARM_SAT_COMP_NUM] < nci->nci[api_cmd->parm[API_PARM_NC_NUM]].sat_list[api_cmd->parm[API_PARM_SAT_LIST_NUM]].sat[api_cmd->parm[API_PARM_SAT_NUM]].comp_num) { - api_cmd->u.sat_comp = nci->nci[api_cmd->parm[API_PARM_NC_NUM]].sat_list[api_cmd->parm[API_PARM_SAT_LIST_NUM]].sat[api_cmd->parm[API_PARM_SAT_NUM]].comp[api_cmd->parm[API_PARM_SAT_COMP_NUM]]; - api_cmd->state = API_RESPONSE; - } else { - api_cmd->state = API_ERROR; - } - } else { - api_cmd->state = API_ERROR; - } - } else { - api_cmd->state = API_ERROR; - } - } else { - api_cmd->state = API_ERROR; - } - break; - case API_GET_TRA_NUM: - api_cmd->parm[API_PARM_TRA_NUM] = trl->tra_num; - api_cmd->state = API_RESPONSE; - break; - case API_GET_TRA_INFO: - if (api_cmd->parm[API_PARM_TRA_NUM] < trl->tra_num) { - api_cmd->u.tra = trl->tra[api_cmd->parm[API_PARM_TRA_NUM]]; - api_cmd->state = API_RESPONSE; - } else { - api_cmd->state = API_ERROR; - } - break; - default: - api_cmd->state = API_ERROR; - } - return 1; -} -#endif -#ifdef API_SOCK -typedef struct -{ - pthread_t thread; - int fd; - struct sockaddr_un addr; - socklen_t len; - int run; -} sock_t; - -static void *sock_cmd_loop (void *p) -{ - sock_t *s = (sock_t *) p; - api_cmd_t sock_cmd; - int n; - netceiver_info_list_t *nc_list=nc_get_list(); - tra_info_t *tra_list=tra_get_list(); - - dbg ("new api client connected\n"); - s->run = 1; - while (s->run){ - n = recv (s->fd, &sock_cmd, sizeof (api_cmd_t), 0); - if (n == sizeof (api_cmd_t)) { - nc_lock_list(); - process_cmd (&sock_cmd, tra_list, nc_list); - nc_unlock_list(); - send (s->fd, &sock_cmd, sizeof (api_cmd_t), 0); - } else { - sock_cmd.magic = MCLI_MAGIC; - sock_cmd.version = MCLI_VERSION; - sock_cmd.state = API_RESPONSE; - send (s->fd, &sock_cmd, sizeof (api_cmd_t), 0); - break; - } - pthread_testcancel(); - } - - close (s->fd); - pthread_detach (s->thread); - free (s); - return NULL; -} - -static void *sock_cmd_listen_loop (void *p) -{ - sock_t tmp; - sock_t *s = (sock_t *) p; - dbg ("sock api listen loop started\n"); - s->run = 1; - - while (s->run) { - tmp.len = sizeof (struct sockaddr_un); - tmp.fd = accept (s->fd, (struct sockaddr*)&tmp.addr, &tmp.len); - if (tmp.fd >= 0) { - sock_t *as = (sock_t *) malloc (sizeof (sock_t)); - if (as == NULL) { - err ("Cannot get memory for socket\n"); - } - *as=tmp; - as->run = 0; - pthread_create (&as->thread, NULL, sock_cmd_loop, as); - } else { - break; - } - pthread_testcancel(); - } - pthread_detach (s->thread); - return NULL; -} - -static sock_t s; -int api_sock_init (const char *cmd_sock_path) -{ - s.addr.sun_family = AF_UNIX; - strcpy (s.addr.sun_path, cmd_sock_path); - s.len = sizeof(struct sockaddr_un); //strlen (cmd_sock_path) + sizeof (s.addr.sun_family); - - if ((s.fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) { - warn ("Cannot get socket %d\n", errno); - return -1; - } - unlink (cmd_sock_path); - if (bind (s.fd, (struct sockaddr*)&s.addr, s.len) < 0) { - warn ("Cannot bind control socket\n"); - return -1; - } - if (chmod(cmd_sock_path, S_IRWXU|S_IRWXG|S_IRWXO)) { - warn ("Cannot chmod 777 socket %s\n", cmd_sock_path); - } - if (listen (s.fd, 5) < 0) { - warn ("Cannot listen on socket\n"); - return -1; - } - return pthread_create (&s.thread, NULL, sock_cmd_listen_loop, &s); -} - -void api_sock_exit (void) -{ - //FIXME memory leak on exit in context structres - s.run=0; - close(s.fd); - - if(pthread_exist(s.thread) && !pthread_cancel (s.thread)) { - pthread_join (s.thread, NULL); - } -} -#endif -#ifdef API_SHM -static api_cmd_t *api_cmd = NULL; -static pthread_t api_cmd_loop_thread; - -static void *api_cmd_loop (void *p) -{ - netceiver_info_list_t *nc_list=nc_get_list(); - tra_info_t *tra_list=tra_get_list(); - while (1) { - nc_lock_list(); - process_cmd (api_cmd, tra_list, nc_list); - nc_unlock_list(); - usleep (1); - pthread_testcancel(); - } - - return NULL; -} - -int api_shm_init (void) -{ - int fd = shm_open (API_SHM_NAMESPACE, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR); - if (fd == -1) { - warn ("Cannot get a shared memory handle\n"); - return -1; - } - if (ftruncate (fd, sizeof (api_cmd_t)) == -1) { - err ("Cannot truncate shared memory\n"); - } - api_cmd = mmap (NULL, sizeof (api_cmd_t), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - if (api_cmd == MAP_FAILED) { - err ("MMap of shared memory region failed\n"); - } - close (fd); - - memset (api_cmd, 0, sizeof (api_cmd_t)); - - pthread_create (&api_cmd_loop_thread, NULL, api_cmd_loop, NULL); - return 0; -} - -void api_shm_exit (void) -{ - if(pthread_exist(api_cmd_loop_thread) && !pthread_cancel (api_cmd_loop_thread)) { - pthread_join (api_cmd_loop_thread, NULL); - } - shm_unlink (API_SHM_NAMESPACE); -} -#endif -#ifdef API_WIN - -void *api_cmd_loop(void *lpvParam) -{ - netceiver_info_list_t *nc_list=nc_get_list(); - tra_info_t *tra_list=tra_get_list(); - api_cmd_t sock_cmd; - DWORD cbBytesRead, cbWritten; - BOOL fSuccess; - HANDLE hPipe; - - hPipe = (HANDLE) lpvParam; - - while (1) { - fSuccess = ReadFile( - hPipe, // handle to pipe - &sock_cmd, // buffer to receive data - sizeof(sock_cmd), // size of buffer - &cbBytesRead, // number of bytes read - NULL); // not overlapped I/O - - if (! fSuccess || cbBytesRead == 0) { - break; - } - - if (cbBytesRead == sizeof (api_cmd_t)) { - nc_lock_list(); - process_cmd (&sock_cmd, tra_list, nc_list); - nc_unlock_list(); - - fSuccess = WriteFile( - hPipe, // handle to pipe - &sock_cmd, // buffer to write from - sizeof(sock_cmd), // number of bytes to write - &cbWritten, // number of bytes written - NULL); // not overlapped I/O - - if (! fSuccess || sizeof(sock_cmd) != cbWritten) { - break; - } - } else { - sock_cmd.magic = MCLI_MAGIC; - sock_cmd.version = MCLI_VERSION; - sock_cmd.state = API_RESPONSE; - fSuccess = WriteFile( - hPipe, // handle to pipe - &sock_cmd, // buffer to write from - sizeof(sock_cmd), // number of bytes to write - &cbWritten, // number of bytes written - NULL); // not overlapped I/O - - if (! fSuccess || sizeof(sock_cmd) != cbWritten) { - break; - } - break; - } - } - - FlushFileBuffers(hPipe); - DisconnectNamedPipe(hPipe); - CloseHandle(hPipe); - - return NULL; -} - -#define BUFSIZE 2048 -void *api_listen_loop(void *p) -{ - BOOL fConnected; - pthread_t api_cmd_loop_thread; - HANDLE hPipe; - LPTSTR lpszPipename=(LPTSTR)p; - - while(1) { - hPipe = CreateNamedPipe( - lpszPipename, // pipe name - PIPE_ACCESS_DUPLEX, // read/write access - PIPE_TYPE_MESSAGE | // message type pipe - PIPE_READMODE_MESSAGE | // message-read mode - PIPE_WAIT, // blocking mode - PIPE_UNLIMITED_INSTANCES, // max. instances - BUFSIZE, // output buffer size - BUFSIZE, // input buffer size - 0, // client time-out - NULL); // default security attribute - - if (hPipe == INVALID_HANDLE_VALUE) { - err ("CreatePipe failed"); - return NULL; - } - pthread_testcancel(); - fConnected = ConnectNamedPipe(hPipe, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED); - - if (fConnected) { - if(pthread_create(&api_cmd_loop_thread, NULL, api_cmd_loop, hPipe)) { - err ("CreateThread failed"); - return NULL; - } else { - pthread_detach(api_cmd_loop_thread); - } - } - else { - CloseHandle(hPipe); - } - } - return NULL; -} - -pthread_t api_listen_loop_thread; - -int api_init (LPTSTR cmd_pipe_path) -{ - return pthread_create (&api_listen_loop_thread, NULL, api_listen_loop, cmd_pipe_path); -} - -void api_exit (void) -{ - if(pthread_exist(api_listen_loop_thread) && !pthread_cancel (api_listen_loop_thread)) { - TerminateThread(pthread_getw32threadhandle_np(api_listen_loop_thread),0); - pthread_join (api_listen_loop_thread, NULL); - } -} - -#endif diff --git a/mcast/client/.svn/text-base/api_server.h.svn-base b/mcast/client/.svn/text-base/api_server.h.svn-base deleted file mode 100644 index e0f946f..0000000 --- a/mcast/client/.svn/text-base/api_server.h.svn-base +++ /dev/null @@ -1,67 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -#define API_SHM_NAMESPACE "/mcli" -#define API_SOCK_NAMESPACE "/var/tmp/mcli.sock" - -typedef enum { API_IDLE, - API_REQUEST, - API_RESPONSE, - API_ERROR -} api_state_t; - -typedef enum { API_GET_NC_NUM, - API_GET_NC_INFO, - API_GET_TUNER_INFO, - API_GET_SAT_LIST_INFO, - API_GET_SAT_INFO, - API_GET_SAT_COMP_INFO, - API_GET_TRA_NUM, - API_GET_TRA_INFO, - API_GET_DEVICE_INFO -} api_cmdval_t; - -typedef enum { API_PARM_NC_NUM=0, - API_PARM_DEVICE_NUM=0, - API_PARM_TUNER_NUM, - API_PARM_SAT_LIST_NUM, - API_PARM_SAT_NUM, - API_PARM_SAT_COMP_NUM, - API_PARM_TRA_NUM, - API_PARM_MAX -} api_parm_t; - -typedef struct { - int magic; - int version; - - api_cmdval_t cmd; - api_state_t state; - int parm[API_PARM_MAX]; - union { - netceiver_info_t nc_info; - tuner_info_t tuner_info; - satellite_list_t sat_list; - satellite_info_t sat_info; - satellite_component_t sat_comp; - tra_t tra; - } u; -} api_cmd_t; - -#ifdef API_SHM -DLL_SYMBOL int api_shm_init (void); -DLL_SYMBOL void api_shm_exit (void); -#endif -#ifdef API_SOCK -DLL_SYMBOL int api_sock_init (const char *cmd_sock_path); -DLL_SYMBOL void api_sock_exit (void); -#endif -#ifdef API_WIN -DLL_SYMBOL int api_init (LPTSTR cmd_pipe_path); -DLL_SYMBOL void api_exit (void); -#endif diff --git a/mcast/client/.svn/text-base/api_shm_test.c.svn-base b/mcast/client/.svn/text-base/api_shm_test.c.svn-base deleted file mode 100644 index fa5a0e7..0000000 --- a/mcast/client/.svn/text-base/api_shm_test.c.svn-base +++ /dev/null @@ -1 +0,0 @@ -link api_test.c \ No newline at end of file diff --git a/mcast/client/.svn/text-base/api_sock_test.c.svn-base b/mcast/client/.svn/text-base/api_sock_test.c.svn-base deleted file mode 100644 index fa5a0e7..0000000 --- a/mcast/client/.svn/text-base/api_sock_test.c.svn-base +++ /dev/null @@ -1 +0,0 @@ -link api_test.c \ No newline at end of file diff --git a/mcast/client/.svn/text-base/api_test.c.svn-base b/mcast/client/.svn/text-base/api_test.c.svn-base deleted file mode 100644 index cfe6afd..0000000 --- a/mcast/client/.svn/text-base/api_test.c.svn-base +++ /dev/null @@ -1,127 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -#include "headers.h" - - -int main (int argc, char **argv) -{ -#ifdef USE_SHM_API - #define API_WAIT_RESPONSE(cmd) { cmd->state=API_REQUEST; while (cmd->state == API_REQUEST) usleep(10*1000); if (cmd->state == API_ERROR) warn ("SHM parameter error\n");} - - int fd = shm_open (API_SHM_NAMESPACE, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR); - if (fd == -1 ) { - warn ("Cannot get a shared memory handle\n"); - return -1; - } - - if (ftruncate (fd, sizeof(api_cmd_t)) == -1) { - err ("Cannot truncate shared memory\n"); - } - - api_cmd_t *api_cmd = mmap(NULL, sizeof(api_cmd_t), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - if ( api_cmd == MAP_FAILED ) { - err ("MMap of shared memory region failed\n"); - } - close(fd); -#endif -#ifdef USE_SOCK_API - #define API_WAIT_RESPONSE(cmd) { cmd->state=API_REQUEST; send (sock_comm, &sock_cmd, sizeof(api_cmd_t), 0); recv (sock_comm, &sock_cmd, sizeof(api_cmd_t), 0); if (cmd->state == API_ERROR) warn ("SHM parameter error\n");} - - int sock_comm; - int sock_name_len = 0; - struct sockaddr_un sock_name; - api_cmd_t sock_cmd; - api_cmd_t *api_cmd=&sock_cmd; - sock_name.sun_family = AF_UNIX; - - strcpy(sock_name.sun_path, API_SOCK_NAMESPACE); - sock_name_len = strlen(API_SOCK_NAMESPACE) + sizeof(sock_name.sun_family); - - if((sock_comm = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) - { - warn ("socket create failure %d\n", errno); - return -1; - } - - if (connect(sock_comm, &sock_name, sock_name_len) < 0) { - err ("connect failure\n"); - } -#endif - api_cmd->cmd=API_GET_NC_NUM; - API_WAIT_RESPONSE(api_cmd); - - printf("nc_num: %d\n", api_cmd->parm[API_PARM_NC_NUM]); - int nc_num=api_cmd->parm[API_PARM_NC_NUM]; - int i; - for(i=0;icmd=API_GET_NC_INFO; - api_cmd->parm[API_PARM_NC_NUM]=i; - API_WAIT_RESPONSE(api_cmd); - printf("nc_info.uuid: %s nc_info.lastseen: %u nc_info.tuner_num: %d\n", api_cmd->u.nc_info.uuid, (unsigned int) api_cmd->u.nc_info.lastseen, api_cmd->u.nc_info.tuner_num); - int j; - int tuner_num=api_cmd->u.nc_info.tuner_num; - for(j=0;jcmd=API_GET_TUNER_INFO; - api_cmd->parm[API_PARM_TUNER_NUM]=j; - API_WAIT_RESPONSE(api_cmd); - printf("tuner_info.fe_info.name: %s SatList: %s\n",api_cmd->u.tuner_info.fe_info.name, api_cmd->u.tuner_info.SatelliteListName); - } - - - int sat_list_num=api_cmd->u.nc_info.sat_list_num; - for(j=0;jcmd=API_GET_SAT_LIST_INFO; - api_cmd->parm[API_PARM_NC_NUM]=i; - api_cmd->parm[API_PARM_SAT_LIST_NUM]=j; - API_WAIT_RESPONSE(api_cmd); - - printf("sat_list_info.Name: %s sat_list_info.sat_num: %d\n", api_cmd->u.sat_list.Name, api_cmd->u.sat_list.sat_num); - - int sat_num=api_cmd->u.sat_list.sat_num; - int k; - for(k=0;kcmd=API_GET_SAT_INFO; - api_cmd->parm[API_PARM_SAT_LIST_NUM]=j; - api_cmd->parm[API_PARM_SAT_NUM]=k; - API_WAIT_RESPONSE(api_cmd); - printf("sat_info.Name: %s\n",api_cmd->u.sat_info.Name); - int comp_num=api_cmd->u.sat_info.comp_num; - int l; - for(l=0;lcmd=API_GET_SAT_COMP_INFO; - api_cmd->parm[API_PARM_SAT_LIST_NUM]=j; - api_cmd->parm[API_PARM_SAT_NUM]=k; - api_cmd->parm[API_PARM_SAT_COMP_NUM]=l; - API_WAIT_RESPONSE(api_cmd); - printf("sat_comp.Polarisation: %d sat_comp.RangeMin: %d sat_comp.RangeMax: %d sat_comp.LOF: %d\n", api_cmd->u.sat_comp.Polarisation, api_cmd->u.sat_comp.RangeMin, api_cmd->u.sat_comp.RangeMax, api_cmd->u.sat_comp.LOF); - } - } - } - } - - while (1) { - api_cmd->cmd=API_GET_TRA_NUM; - API_WAIT_RESPONSE(api_cmd); - - printf("tra_num: %d\n", api_cmd->parm[API_PARM_TRA_NUM]); - int tra_num=api_cmd->parm[API_PARM_TRA_NUM]; - for(i=0;icmd=API_GET_TRA_INFO; - api_cmd->parm[API_PARM_TRA_NUM]=i; - API_WAIT_RESPONSE(api_cmd); - char host[INET6_ADDRSTRLEN]; - inet_ntop (AF_INET6, &api_cmd->u.tra.mcg, (char *) host, INET6_ADDRSTRLEN); - - printf("tra.slot:%d tra.fe_type: %d tra.InUse: % 3d tra.mcg: %s tra.uuid: %s tra.lastseen: %u tra.lock:%d tra.strength:%d tra.snr:%d tra.ber:%d\n", api_cmd->u.tra.slot, api_cmd->u.tra.fe_type, api_cmd->u.tra.InUse, host, api_cmd->u.tra.uuid, (unsigned int) api_cmd->u.tra.lastseen, api_cmd->u.tra.s.st, api_cmd->u.tra.s.strength, api_cmd->u.tra.s.snr, api_cmd->u.tra.s.ber); - } - sleep(2); - } - return 0; -} - diff --git a/mcast/client/.svn/text-base/ci_handler.c.svn-base b/mcast/client/.svn/text-base/ci_handler.c.svn-base deleted file mode 100644 index beef8ff..0000000 --- a/mcast/client/.svn/text-base/ci_handler.c.svn-base +++ /dev/null @@ -1,321 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -#include "headers.h" - -//#define SHOW_TPDU - -static ci_dev_t devs; -static int dev_num = 0; -static int ci_run = 0; -static pthread_t ci_handler_thread; -static int port = 23000; -static char iface[IFNAMSIZ]; - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static int ci_connect (ci_dev_t * c) -{ - int ret; - int j; - struct in6_addr nc; - - if (c->connected) { - return 0; - } - - if (c->fd_ci) { - closesocket (c->fd_ci); - } - - c->fd_ci = socket (PF_INET6, SOCK_STREAM, 0); - j = 1; - if (setsockopt (c->fd_ci, SOL_SOCKET, SO_REUSEADDR, (_SOTYPE) & j, sizeof (j)) < 0) { - warn ("setsockopt REUSEADDR\n"); - } - - j = 1; - if (setsockopt (c->fd_ci, SOL_SOCKET, TCP_NODELAY, (_SOTYPE) & j, sizeof (j)) < 0) { - warn ("setsockopt TCP_NODELAY\n"); - } - - inet_pton (AF_INET6, c->uuid, &nc); -#ifdef SHOW_TPDU - char host[INET6_ADDRSTRLEN]; - inet_ntop (AF_INET6, &nc, (char *) host, INET6_ADDRSTRLEN); - info ("Connect To: %s\n", host); -#endif - struct sockaddr_in6 addr; - memset (&addr, 0, sizeof (struct sockaddr_in6)); - - addr.sin6_family = AF_INET6; - addr.sin6_port = htons (port); - addr.sin6_addr = nc; - addr.sin6_scope_id = if_nametoindex (iface); - - ret = connect (c->fd_ci, (struct sockaddr *) &addr, sizeof (struct sockaddr_in6)); - if (ret < 0) { - warn ("Failed to access NetCeiver CA support\n"); - } else { - c->connected = 1; - } - return ret; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -int ci_write_pdu (ci_dev_t * c, ci_pdu_t * tpdu) -{ - int ret = -1; - - dbg ("ci_write_pdu: %p %d\n", tpdu->data, tpdu->len); - - ci_decode_ll (tpdu->data, tpdu->len); - memcpy (c->txdata + 2, tpdu->data, tpdu->len); - c->txdata[0] = tpdu->len >> 8; - c->txdata[1] = tpdu->len & 0xff; - if (!ci_connect (c)) { -#ifdef SHOW_TPDU - int j; - info ("Send TPDU: "); - for (j = 0; j < tpdu->len; j++) { - info ("%02x ", tpdu->data[j]); - } - info ("\n"); -#endif - ret = send (c->fd_ci, (char *) c->txdata, tpdu->len + 2, 0); - if (ret < 0) { - c->connected = 0; - } - } - return ret; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static void clean_ci_recv_thread (void *argp) -{ - ci_dev_t *c = (ci_dev_t *) argp; - if (c->txdata) { - free (c->txdata); - } - if (c->rxdata) { - free (c->rxdata); - } - closesocket (c->fd_ci); -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static void *ci_recv (void *argp) -{ - ci_dev_t *c = (ci_dev_t *) argp; - ci_pdu_t tpdu; - int ret = -1; - - pthread_cleanup_push (clean_ci_recv_thread, c); - - c->rxdata = (u_int8_t *) malloc (CA_TPDU_MAX + 2); - if (!c->rxdata) - err ("ci_recv: out of memory\n"); - c->txdata = (u_int8_t *) malloc (CA_TPDU_MAX + 2); - if (!c->txdata) - err ("ci_recv: out of memory\n"); - - if (c->rxdata && c->txdata) { - c->recv_run = 1; - - while (c->recv_run) { - if (c->connected) { - ret = recv (c->fd_ci, (char *) c->rxdata, CA_TPDU_MAX + 2, 0); - if (ret > 0) { - tpdu.data = c->rxdata; - while (ret > 0) { - tpdu.len = ntohs16 (tpdu.data); - if (tpdu.len >= ret) { - break; - } - tpdu.data += 2; -#ifdef SHOW_TPDU - int j; - info ("Received TPDU: "); - for (j = 0; j < tpdu.len; j++) { - info ("%02x ", tpdu.data[j]); - } - info ("\n"); -#endif - ci_decode_ll (tpdu.data, tpdu.len); - unsigned int slot = (unsigned int) tpdu.data[0]; - if (slot < CA_MAX_SLOTS) { - if (c->handle_ci_slot[slot]) { - c->handle_ci_slot[slot] (&tpdu, c->handle_ci_slot_context[slot]); - } - } - - tpdu.data += tpdu.len; - ret -= tpdu.len + 2; - } - } else { - if (errno == EAGAIN) { - ret = 0; - } else { - c->connected = 0; - } - } - } - usleep (10 * 1000); - } - } - pthread_cleanup_pop (1); - - return NULL; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -int ci_register_handler (ci_dev_t * c, int slot, int (*p) (ci_pdu_t *, void *), void *context) -{ - if (slot < CA_MAX_SLOTS) { - c->handle_ci_slot[slot] = p; - c->handle_ci_slot_context[slot] = context; - return 0; - } - return -1; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -int ci_unregister_handler (ci_dev_t * c, int slot) -{ - if (slot < CA_MAX_SLOTS) { - c->handle_ci_slot[slot] = NULL; - c->handle_ci_slot_context[slot] = NULL; - return 0; - } - return -1; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static ci_dev_t *ci_add (void) -{ - ci_dev_t *c = (ci_dev_t *) malloc (sizeof (ci_dev_t)); - if (!c) - return NULL; - memset (c, 0, sizeof (ci_dev_t)); - dvbmc_list_add_head (&devs.list, &c->list); - return c; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static void ci_del (ci_dev_t * c) -{ - c->recv_run = 0; - if (pthread_exist(c->ci_recv_thread) && !pthread_cancel (c->ci_recv_thread)) { - pthread_join (c->ci_recv_thread, NULL); - } - dvbmc_list_remove (&c->list); - free (c); -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - - -ci_dev_t *ci_find_dev_by_uuid (char *uuid) -{ - ci_dev_t *c; - DVBMC_LIST_FOR_EACH_ENTRY (c, &devs.list, ci_dev_t, list) { - if (!strcmp (c->uuid, uuid)) { - return c; - } - } - return NULL; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static void *ci_handler (void *p) -{ - int n; - netceiver_info_list_t *nc_list = nc_get_list (); - ci_run = 1; - while (ci_run) { - nc_lock_list (); - for (n = 0; n < nc_list->nci_num; n++) { - netceiver_info_t *nci = nc_list->nci + n; - char *uuid = nci->uuid; - if (!strlen (uuid) || ci_find_dev_by_uuid (uuid)) { - //already seen - continue; - } - - ci_dev_t *c = ci_add (); - if (!c) { - err ("Cannot get memory for dvb loopback context\n"); - } - - dbg ("allocate ci dev %d for uuid %s\n", dev_num, uuid); - - strcpy (c->uuid, uuid); - c->cacaps = &nci->ci; - c->device = dev_num++; - - info ("Starting ci thread for netceiver UUID %s\n", c->uuid); - int ret = pthread_create (&c->ci_recv_thread, NULL, ci_recv, c); - while (!ret && !c->recv_run) { - usleep (10000); - } - if (ret) { - err ("pthread_create failed with %d\n", ret); - } - } - nc_unlock_list (); - sleep (1); - } - return NULL; -} - -int ci_init (int ca_enable, char *intf, int p) -{ - int ret = 0; - if (intf) { - strcpy (iface, intf); - } else { - iface[0] = 0; - } - if (p) { - port = p; - } - - dvbmc_list_init (&devs.list); - if (ca_enable) { - ret = pthread_create (&ci_handler_thread, NULL, ci_handler, NULL); - while (!ret && !ci_run) { - usleep (10000); - } - } - return ret; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -void ci_exit (void) -{ - ci_dev_t *c; - ci_dev_t *ctmp; - if (pthread_exist (ci_handler_thread)) { - if (pthread_exist(ci_handler_thread) && !pthread_cancel (ci_handler_thread)) { - pthread_join (ci_handler_thread, NULL); - } - - DVBMC_LIST_FOR_EACH_ENTRY_SAFE (c, ctmp, &devs.list, ci_dev_t, list) { - ci_del (c); - } - } -} diff --git a/mcast/client/.svn/text-base/ci_handler.h.svn-base b/mcast/client/.svn/text-base/ci_handler.h.svn-base deleted file mode 100644 index 3ecfc02..0000000 --- a/mcast/client/.svn/text-base/ci_handler.h.svn-base +++ /dev/null @@ -1,30 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -typedef struct { - struct list list; - - pthread_t ci_recv_thread; - char uuid[UUID_SIZE]; - SOCKET fd_ci; - int recv_run; - int device; - int connected; - recv_cacaps_t *cacaps; - u_int8_t *txdata; - u_int8_t *rxdata; - int (*handle_ci_slot[CA_MAX_SLOTS]) (ci_pdu_t *tpdu, void *context); - void *handle_ci_slot_context[CA_MAX_SLOTS]; -} ci_dev_t; - -DLL_SYMBOL int ci_register_handler(ci_dev_t *c, int slot, int (*p) (ci_pdu_t *, void *), void *context); -DLL_SYMBOL int ci_unregister_handler(ci_dev_t *c, int slot); -DLL_SYMBOL int ci_write_pdu(ci_dev_t *c, ci_pdu_t *tpdu); -DLL_SYMBOL ci_dev_t *ci_find_dev_by_uuid (char *uuid); -DLL_SYMBOL int ci_init (int ca_enable, char *intf, int p); -DLL_SYMBOL void ci_exit (void); diff --git a/mcast/client/.svn/text-base/ciparser.c.svn-base b/mcast/client/.svn/text-base/ciparser.c.svn-base deleted file mode 100644 index 0a2c0bf..0000000 --- a/mcast/client/.svn/text-base/ciparser.c.svn-base +++ /dev/null @@ -1 +0,0 @@ -link ../common/ciparser.c \ No newline at end of file diff --git a/mcast/client/.svn/text-base/dummy_client.c.svn-base b/mcast/client/.svn/text-base/dummy_client.c.svn-base deleted file mode 100644 index 2a397d9..0000000 --- a/mcast/client/.svn/text-base/dummy_client.c.svn-base +++ /dev/null @@ -1,101 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -#define DEBUG 1 -#include "headers.h" - - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static int dummy_handle_ts (unsigned char *buffer, size_t len, void *p) -{ - FILE *f=(FILE*)p; - fwrite(buffer, len, 1, f); - return len; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static int dummy_handle_ten (tra_t *ten, void *p) -{ - FILE *f=(FILE*)p; - if(ten) { - fprintf(f,"Status: %02X, Strength: %04X, SNR: %04X, BER: %04X\n",ten->s.st,ten->s.strength, ten->s.snr, ten->s.ber); - } - return 0; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -void dummy_client (void) -{ - int i; - int n; - int run=1; - FILE *f; - recv_info_t *r; - recv_sec_t sec; - struct dvb_frontend_parameters fep; - dvb_pid_t pids[3]; - - netceiver_info_list_t *nc_list=nc_get_list(); -#if 0 - printf("Looking for netceivers out there....\n"); - while(run) { - nc_lock_list(); - for (n = 0; n < nc_list->nci_num; n++) { - netceiver_info_t *nci = nc_list->nci + n; - printf("\nFound NetCeiver: %s\n",nci->uuid); - for (i = 0; i < nci->tuner_num; i++) { - printf(" Tuner: %s, Type %d\n",nci->tuner[i].fe_info.name, nci->tuner[i].fe_info.type); - } - } - nc_unlock_list(); - if(nc_list->nci_num) { - break; - } - sleep(1); - } -#endif - f=fopen("out.ts","wb"); - - r = recv_add(); - if (!r) { - fprintf (stderr, "Cannot get memory for receiver\n"); - return; - } - register_ten_handler (r, dummy_handle_ten, stderr); - register_ts_handler (r, dummy_handle_ts, f); - - memset(&sec, 0, sizeof(recv_sec_t)); - sec.voltage=SEC_VOLTAGE_18; - sec.mini_cmd=SEC_MINI_A; - sec.tone_mode=SEC_TONE_ON; - - memset(&fep, 0, sizeof(struct dvb_frontend_parameters)); - fep.frequency=12544000; - fep.inversion=INVERSION_AUTO; - fep.u.qpsk.symbol_rate=22000000; - fep.u.qpsk.fec_inner=FEC_5_6; - - memset(&pids, 0, sizeof(pids)); - pids[0].pid=511; - pids[1].pid=512; - pids[2].pid=511; - pids[2].id=2; - pids[3].pid=511; - pids[3].id=1; - pids[4].pid=-1; - - printf("\nTuning a station and writing transport data to file 'out.ts':\n"); - recv_tune (r, (fe_type_t)FE_QPSK, 1800+192, &sec, &fep, pids); - getchar(); - register_ten_handler (r, NULL, NULL); - register_ts_handler (r, NULL, NULL); - fclose(f); -} diff --git a/mcast/client/.svn/text-base/dummy_client.h.svn-base b/mcast/client/.svn/text-base/dummy_client.h.svn-base deleted file mode 100644 index e79cbf1..0000000 --- a/mcast/client/.svn/text-base/dummy_client.h.svn-base +++ /dev/null @@ -1,10 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -void dummy_client (void); - diff --git a/mcast/client/.svn/text-base/dvblo_handler.c.svn-base b/mcast/client/.svn/text-base/dvblo_handler.c.svn-base deleted file mode 100644 index 875749d..0000000 --- a/mcast/client/.svn/text-base/dvblo_handler.c.svn-base +++ /dev/null @@ -1,716 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -#include "headers.h" -#include "dvblo_ioctl.h" -#include "dvblo_handler.h" - -//#define SHOW_EVENTS -//#define SHOW_TPDU -//#define SHOW_PIDS - -#define TUNE_FORCED_TIMEOUT 5 - -extern pthread_mutex_t lock; -extern recv_info_t receivers; - -static dvblo_dev_t devs; -static int dev_num = 0; -static int dvblo_run = 1; -static int cidev = 0; -static int reload = 0; -static dvblo_cacaps_t cacaps; - -static int special_status_mode=0; // 1: return rotor mode and tuner slot in status - -static int dvblo_get_nc_addr (char *addrstr, char *uuid) -{ - int len = strlen (uuid); - if (len <= 5) { - return -1; - } - memset (addrstr, 0, INET6_ADDRSTRLEN); - - strncpy (addrstr, uuid, len - 5); - return 0; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static int dvblo_handle_ts (unsigned char *buffer, size_t len, void *p) -{ - dvblo_dev_t * d=( dvblo_dev_t *)p; - return write (d->fd, buffer, len); -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static int dvblo_handle_ten (tra_t * ten, void *c) -{ - dvblo_dev_t *d = (dvblo_dev_t *) c; - dbg ("TEN: %ld %p %p\n", gettid (), ten, d); - - if (ten) { - dvblo_festatus_t stat; - memcpy(&stat, &ten->s, sizeof(dvblo_festatus_t)); - - d->ten = *ten; - - if (special_status_mode) { - stat.st|=(ten->rotor_status&3)<<8; - stat.st|=(1+ten->slot)<<12; - } - - return ioctl (d->fd, DVBLO_SET_FRONTEND_STATUS, (dvblo_festatus_t*)&stat); - } else { - dvblo_festatus_t s; - memset (&s, 0, sizeof (dvblo_festatus_t)); - - return ioctl (d->fd, DVBLO_SET_FRONTEND_STATUS, &s); - } -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static void sig_handler (int signal) -{ - dbg ("Signal: %d\n", signal); - - switch (signal) { - case SIGHUP: - reload = 1; - break; - case SIGTERM: - case SIGINT: - dbg ("Trying to exit, got signal %d...\n", signal); - dvblo_run = 0; - break; - } -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -int dvblo_init (void) -{ - char char_dev[100]; - int j, k = 0; - struct dvb_frontend_info fe_info; - dvblo_festatus_t fe_status; - - dvbmc_list_init (&devs.list); - - memset (&fe_info, 0, sizeof (struct dvb_frontend_info)); - fe_info.type = -1; - strcpy (fe_info.name, "Unconfigured"); - memset (&fe_status, 0, sizeof (dvblo_festatus_t)); - - for (j = 0; j < MAX_DEVICES; j++) { - - sprintf (char_dev, "/dev/dvblo%d", j); - int fd = open (char_dev, O_RDWR); - - if (fd == -1) { - warn ("Cannot Open %s\n", char_dev); - continue; - } - k++; - ioctl (fd, DVBLO_SET_FRONTEND_INFO, &fe_info); - ioctl (fd, DVBLO_SET_FRONTEND_STATUS, &fe_status); - ioctl (fd, DVBLO_SET_CA_CAPS, &cacaps); - dvblo_tpdu_t tpdu; - while (1) { - if (ioctl (fd, DVBLO_GET_TPDU, &tpdu) || !tpdu.len) { - break; - } - } - close (fd); - } - - signal (SIGTERM, &sig_handler); - signal (SIGINT, &sig_handler); - signal (SIGHUP, &sig_handler); - signal (SIGPIPE, &sig_handler); - return k; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static int dvblo_convert_pids (dvblo_dev_t * d) -{ - dvb_pid_t *dst = d->dstpids; - dvblo_pids_t *src = &d->pids; - int i; -#ifdef SHOW_PIDS - info ("devnum:%d pidnum:%d\n", d->device, src->num); -#endif - for (i = 0; i < src->num; i++) { -#ifdef SHOW_PIDS - printf ("devnum:%d pid:%04x\n", d->device, src->pid[i]); -#endif - dst[i].pid = src->pid[i]; - if (d->ca_enable) { - dst[i].id = ci_cpl_find_caid_by_pid (src->pid[i]); - if (dst[i].id != 0) { - dbg ("pid: %04x id: %04x\n", dst[i].pid, dst[i].id); - } - } - } - dst[i].pid = -1; - return i; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static int dvblo_tune (dvblo_dev_t * d, int force) -{ - satellite_reference_t satref; - int SatPos; - int mode; - int ret = 0; - - nc_lock_list (); - - for (mode = 0; mode < 3; mode++) { - if (satellite_find_by_diseqc (&satref, (recv_sec_t*)&d->sec, &d->fe_parms, mode)) - break; - } - - if (mode == 3 || (mode == 2 && (d->type == FE_QAM || d->type == FE_OFDM))) { - SatPos = NO_SAT_POS; - } else { - int LOF = 0; - if (mode) { - LOF = satellite_get_lof_by_ref (&satref); - d->fe_parms.frequency += LOF * 1000; - } - SatPos = satellite_get_pos_by_ref (&satref); - recv_sec_t *sec=satellite_find_sec_by_ref (&satref); - memcpy(&d->sec, sec, sizeof(recv_sec_t)); - d->sec.voltage = satellite_find_pol_by_ref (&satref); -#if 1 //def SHOW_EVENTS - printf ("Found satellite position: %d fe_parms: %d LOF: %d voltage: %d mode: %d\n", SatPos, d->fe_parms.frequency, LOF, d->sec.voltage, mode); -#endif - } - nc_unlock_list (); - if (force && d->pids.num == 0) { - d->dstpids[0].pid = 0; - d->dstpids[0].id = 0; - d->dstpids[1].pid = -1; - ret = 2; - } else { - dvblo_convert_pids (d); - } - recv_tune (d->r, d->type, SatPos, (recv_sec_t*)&d->sec, &d->fe_parms, d->dstpids); - return ret; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -int dvblo_write_ci (ci_pdu_t * pdu, void *context) -{ - dvblo_dev_t *d = (dvblo_dev_t *) context; - dvblo_tpdu_t tpdu; - memcpy (tpdu.data, pdu->data, pdu->len); - tpdu.len = pdu->len; - if (!cmd.reelcammode) - tpdu.data[0] = 0; - return ioctl (d->fd, DVBLO_SET_TPDU, &tpdu); -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static void clean_dvblo_recv_thread (void *argp) -{ - dvblo_dev_t *d = (dvblo_dev_t *) argp; - recv_del (d->r); - close (d->fd); -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static void *dvblo_recv (void *argp) -{ - dvblo_dev_t *d = (dvblo_dev_t *) argp; - dvblo_tpdu_t tpdu; - struct dvb_frontend_parameters old_fe_parms; - dvblo_sec_t old_sec; - struct pollfd fds[1]; - int timeout_msecs = 50; - int ret; - time_t last_ci_reset = 0; - char char_dev[100]; - int need_tune = 0; - time_t forced = 0; - unsigned int event = 0; - - dvblo_cacaps_t cacap; - - sprintf (char_dev, "/dev/dvblo%d", d->device); - dbg ("Using character device %s for dvb loopback\n", char_dev); - - d->fd = open (char_dev, O_RDWR); - - if (d->fd < 0) { - err ("Cannot open %s - dvbloop driver loaded?\n", char_dev); - } - - pthread_cleanup_push (clean_dvblo_recv_thread, d); - - fds[0].fd = d->fd; - - if (!ioctl (d->fd, DVBLO_IOCCHECKDEV)) { - if (!ioctl (d->fd, DVBLO_IOCADDDEV)) { - info ("created dvb adapter: %d\n", d->device); - } - } - d->info.frequency_min = 1; - d->info.frequency_max = 2000000000; - - ioctl (d->fd, DVBLO_SET_FRONTEND_INFO, &d->info); - ioctl (d->fd, DVBLO_GET_FRONTEND_PARAMETERS, &d->fe_parms); - ioctl (d->fd, DVBLO_GET_PIDLIST, &d->pids); - ioctl (d->fd, DVBLO_GET_SEC_PARAMETERS, &d->sec); - - old_fe_parms = d->fe_parms; - old_sec = d->sec; -#ifdef DEBUG - print_fe_info (&d->info); -#endif - d->recv_run = 1; - - if (dvblo_tune (d, 1) == 2) { - forced = time (NULL); - } - - while (d->recv_run) { - if (d->cacaps->cap.slot_num) { - nc_lock_list (); -#ifdef SHOW_TPDU - info ("ca_caps->: %p ci_slot:%d info[0]:%02x info[1]:%02x\n", d->cacaps, d->ci_slot, d->cacaps->info[0].flags, d->cacaps->info[1].flags); -#endif - cacap = *d->cacaps; - if (!cmd.reelcammode) { - if (d->ci_slot != 0) { - cacap.info[0] = cacap.info[d->ci_slot]; - } - cacap.cap.slot_num = 1; - } - if ((time (NULL) - last_ci_reset) < cmd.ci_timeout) { - cacap.info[0].flags = 0; - } - ioctl (d->fd, DVBLO_SET_CA_CAPS, &cacap); - nc_unlock_list (); - } - - fds[0].events = POLLIN; - ret = poll (fds, 1, timeout_msecs); - if (ret > 0) { - ioctl (d->fd, DVBLO_GET_EVENT_MASK, &event); - ioctl (d->fd, DVBLO_GET_FRONTEND_PARAMETERS, &d->fe_parms); - ioctl (d->fd, DVBLO_GET_PIDLIST, &d->pids); - ioctl (d->fd, DVBLO_GET_SEC_PARAMETERS, &d->sec); - if (event & EV_MASK_FE) { -#ifdef SHOW_EVENTS - printf ("%p/%p Event Received: FE+Tuner/", d, d->r); - if (event & EV_FRONTEND) { - printf ("Frontend "); - } - if (event & EV_TUNER) { - printf ("Tuner "); - } - if (event & EV_FREQUENCY) { - printf ("Frequency:%d ", d->fe_parms.frequency); - } - if (event & EV_BANDWIDTH) { - printf ("Bandwidth "); - } - printf ("\n"); -#endif - if (memcmp (&d->fe_parms, &old_fe_parms, sizeof (struct dvb_frontend_parameters))) { - old_fe_parms = d->fe_parms; - dbg ("fe_parms have changed!\n"); - need_tune = 1; - if (d->ca_enable) { - ci_cpl_clear (d->ci_slot); - } - } - } - if (event & EV_MASK_SEC) { -#ifdef SHOW_EVENTS - printf ("%p/%p Event Received: SEC/", d, d->r); - if (event & EV_TONE) { - printf ("Tone:%d ", d->sec.tone_mode); - } - if (event & EV_VOLTAGE) { - printf ("Voltage:%d ", d->sec.voltage); - } - if (event & EV_DISEC_MSG) { - printf ("DISEC-Message:"); - int j; - for (j = 0; j < d->sec.diseqc_cmd.msg_len; j++) { - printf ("%02x ", d->sec.diseqc_cmd.msg[j]); - } - } - if (event & EV_DISEC_BURST) { - printf ("DISEC-Burst:%d ", d->sec.mini_cmd); - } - printf ("\n"); -#endif - if (d->sec.voltage == SEC_VOLTAGE_OFF) { - recv_stop (d->r); - memset (&old_fe_parms, 0, sizeof (struct dvb_frontend_parameters)); - need_tune = 0; - dbg ("Stop %p\n", d->r); - } else if (memcmp (&d->sec, &old_sec, sizeof (dvblo_sec_t))) { - dbg ("SEC parms have changed!\n"); - old_sec = d->sec; - need_tune = 1; - if (d->ca_enable) { - ci_cpl_clear (d->ci_slot); - } - } - } - if (event & EV_MASK_CA) { -#ifdef SHOW_EVENTS - printf ("%p/%p Event Received: CA/", d, d->r); -#endif - if (event & EV_CA_WRITE) { -#ifdef SHOW_EVENTS - printf ("WRITE "); -#endif - while (1) { - if (!ioctl (d->fd, DVBLO_GET_TPDU, &tpdu) && tpdu.len) { - if (d->c && d->ca_enable) { - ci_pdu_t pdu; - pdu.len = tpdu.len; - pdu.data = tpdu.data; - if (!cmd.reelcammode) { - pdu.data[0] = d->ci_slot; - } - ci_write_pdu (d->c, &pdu); - event |= EV_PIDFILTER; - } - } else { - break; - } - } - } - if (event & EV_CA_RESET) { -#ifdef SHOW_EVENTS - printf ("RESET "); -#endif - last_ci_reset = time (NULL); - if (d->ca_enable) { - ci_cpl_clear (d->ci_slot); - } - } -#ifdef SHOW_EVENTS - printf ("\n"); -#endif - } - if (need_tune) { - if (dvblo_tune (d, 1) == 2) { - forced = time (NULL); - } - need_tune = 0; - } else if (event & EV_MASK_PID) { -#ifdef SHOW_EVENTS - printf ("%p/%p Event Received: Demux/", d, d->r); - if (event & EV_PIDFILTER) { - printf ("PID filter: %d pids", d->pids.num); - } - printf ("\n"); -#endif - forced = 0; - } - } - if (forced) { - if ((time (NULL) - forced) < TUNE_FORCED_TIMEOUT) { - event &= ~EV_PIDFILTER; - } else { - event |= EV_PIDFILTER; - forced = 0; - } - } - if (event & EV_PIDFILTER) { - dvblo_convert_pids (d); - recv_pids (d->r, d->dstpids); - } - event = 0; - } - pthread_cleanup_pop (1); - return NULL; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static dvblo_dev_t *dvblo_add (void) -{ - dvblo_dev_t *d = (dvblo_dev_t *) malloc (sizeof (dvblo_dev_t)); - - if (!d) - return NULL; - memset (d, 0, sizeof (dvblo_dev_t)); - dvbmc_list_add_head (&devs.list, &d->list); - return d; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static void dvblo_del (dvblo_dev_t * d) -{ - d->recv_run = 0; - if (pthread_exist(d->dvblo_recv_thread) && !pthread_cancel (d->dvblo_recv_thread)) { - pthread_join (d->dvblo_recv_thread, NULL); - } - dvbmc_list_remove (&d->list); - free (d); -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -void dvblo_exit (void) -{ - dvblo_dev_t *d; - dvblo_dev_t *dtmp; - - DVBMC_LIST_FOR_EACH_ENTRY_SAFE (d, dtmp, &devs.list, dvblo_dev_t, list) { - dvblo_del (d); - } -} - -static dvblo_dev_t *find_dev_by_uuid (dvblo_dev_t * devs, char *uuid) -{ - dvblo_dev_t *d; - DVBMC_LIST_FOR_EACH_ENTRY (d, &devs->list, dvblo_dev_t, list) { - if (!strcmp (d->uuid, uuid)) { - return d; - } - } - return NULL; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static int count_dev_by_type (dvblo_dev_t * devs, fe_type_t type) -{ - int ret = 0; - dvblo_dev_t *d; - DVBMC_LIST_FOR_EACH_ENTRY (d, &devs->list, dvblo_dev_t, list) { - if (type == d->type) { - ret++; - } - } - return ret; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -satellite_list_t *dvblo_get_sat_list (char *SatelliteListName, netceiver_info_t * nci) -{ - int i; - dbg ("looking for %s\n", SatelliteListName); - for (i = 0; i < nci->sat_list_num; i++) { - if (!strcmp (SatelliteListName, nci->sat_list[i].Name)) { - dbg ("found uuid in sat list %d\n", i); - return nci->sat_list + i; - } - } - return NULL; -} - -//----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -static int diseqc_write_conf (char *disec_conf_path, char *rotor_conf_path, dvblo_dev_t * devs, int mode) -{ - int j, k; - dvblo_dev_t *d; - char buf[80]; - char tstr[16]; - FILE *f = NULL; - FILE *fr = NULL; - - f = fopen (disec_conf_path, "wt"); - if (f == NULL) { - return 0; - } - fprintf (f, "# diseqc.conf in VDR format auto generated\n\n"); - - if (strlen(rotor_conf_path)) { - special_status_mode=1; - fr = fopen (rotor_conf_path, "wt"); - } - if (fr) - fprintf (fr, "# rotor.conf auto generated\n\n"); - - DVBMC_LIST_FOR_EACH_ENTRY (d, &devs->list, dvblo_dev_t, list) { - satellite_list_t *sat_list = dvblo_get_sat_list (d->nci->tuner[d->tuner].SatelliteListName, d->nci); - if (!sat_list) { - continue; - } - for (j = 0; j < sat_list->sat_num; j++) { - satellite_info_t *sat = sat_list->sat + j; - for (k = 0; k < sat->comp_num; k++) { - satellite_component_t *comp = sat->comp + k; - int newpos = sat->SatPos ^ 1800; - sprintf (buf, "e0 10 6f %02x %02x %02x", newpos & 0xff, (newpos >> 8) & 0xff, comp->Polarisation << 1 | !(comp->sec.tone_mode & 1)); - if (mode) { - sprintf (tstr, "A%d ", d->device + 1); - } else { - tstr[0] = 0; - } - fprintf (f, "%s%s %d %c 0 [ %s ]\n", tstr, sat->Name, comp->RangeMax, comp->Polarisation == POL_H ? 'H' : 'V', buf); - } - fprintf (f, "\n"); - if (j==0 && fr && sat->type==SAT_SRC_ROTOR) { - fprintf(fr, "%s %i %i %i %i %i\n", tstr, sat->SatPosMin, sat->SatPosMax, - sat->AutoFocus, sat->Latitude, sat->Longitude); - } - } - } - info ("created %s\n", disec_conf_path); - fclose (f); - if (fr) { - info ("created %s\n", rotor_conf_path); - fclose(fr); - } - return 1; -} - -void dvblo_handler (void) -{ - int i; - int n; - int nci_num = 0; - int write_conf = strlen (cmd.disec_conf_path); - netceiver_info_list_t *nc_list = nc_get_list (); - memset (&cacaps, 0, sizeof (dvblo_cacaps_t)); - - info ("Device Type Limits: DVB-S: %d DVB-C: %d DVB-T: %d ATSC: %d DVB-S2: %d\n\n", cmd.tuner_type_limit[FE_QPSK], cmd.tuner_type_limit[FE_QAM], cmd.tuner_type_limit[FE_OFDM], cmd.tuner_type_limit[FE_ATSC], cmd.tuner_type_limit[FE_DVBS2]); - - while (dvblo_run) { - nc_lock_list (); - for (n = 0; n < nc_list->nci_num; n++) { - netceiver_info_t *nci = nc_list->nci + n; - for (i = 0; i < nci->tuner_num; i++) { - char *uuid = nci->tuner[i].uuid; - if (nci->tuner[i].preference < 0 || !strlen (uuid) || find_dev_by_uuid (&devs, uuid)) { - //already seen - continue; - } - fe_type_t type = nci->tuner[i].fe_info.type; - - if (type > FE_DVBS2) { - continue; - } - if(dev_num >= MAX_DEVICES) { - dbg("Limit dev_num reached limit of "MAX_DEVICES"\n"); - continue; - } - if (count_dev_by_type (&devs, type) == cmd.tuner_type_limit[type]) { - dbg ("Limit: %d %d>%d\n", type, count_dev_by_type (&devs, type), cmd.tuner_type_limit[type]); - continue; - } - - dvblo_dev_t *d = dvblo_add (); - if (!d) { - err ("Cannot get memory for dvb loopback context\n"); - } - - dbg ("allocate dev %d for uuid %s\n", dev_num, uuid); - - d->info = nci->tuner[i].fe_info; - - if (type == FE_DVBS2) { - d->info.type = FE_QPSK; - } - - strcpy (d->uuid, nci->tuner[i].uuid); - if (!cmd.reelcammode) { - if (cidev < CA_MAX_SLOTS && (cmd.ca_enable & (1 << dev_num))) { - d->cacaps=(dvblo_cacaps_t*)((void *) &nci->ci); - d->ca_enable = 1; - dbg ("Enabling CA support for device %d\n", dev_num); - char addrstr[INET6_ADDRSTRLEN]; - dvblo_get_nc_addr (addrstr, d->uuid); - dbg ("dvblo_get_nc_addr: %s %s\n", addrstr, d->uuid); - d->c = ci_find_dev_by_uuid (addrstr); - if (d->c) { - dbg ("Attaching ci dev %p to dvblo dev %p\n", d->c, d); - ci_register_handler (d->c, cidev, dvblo_write_ci, d); - d->ci_slot = cidev++; - } else { - dvblo_del (d); //retry next time - break; - } - } else { - d->cacaps = &cacaps; - d->ca_enable = 0; - dbg ("Disabling CA support for device %d\n", dev_num); - } - } else { - if (nci->ci.cap.slot_num && cmd.ca_enable) { - d->ca_enable = 1; - dbg ("Enabling CA support for device %d\n", dev_num); - if (!cidev) { - d->cacaps = (dvblo_cacaps_t*)((void *) &nci->ci); - char addrstr[INET6_ADDRSTRLEN]; - dvblo_get_nc_addr (addrstr, d->uuid); - dbg ("dvblo_get_nc_addr: %s %s\n", addrstr, d->uuid); - d->c = ci_find_dev_by_uuid (addrstr); - if (d->c) { - dbg ("Attaching ci dev %p to dvblo dev %p\n", d->c, d); - ci_register_handler (d->c, cidev++, dvblo_write_ci, d); - ci_register_handler (d->c, cidev++, dvblo_write_ci, d); - } else { - dvblo_del (d); //retry next time - break; - } - } else { - d->cacaps = &cacaps; - } - } else { - d->cacaps = &cacaps; - d->ca_enable = 0; - dbg ("Disabling CA support for device %d\n", dev_num); - } - } - - d->r = recv_add (); - if (!d->r) { - err ("Cannot get memory for receiver\n"); - } - - d->device = dev_num++; - d->type = type; - d->tuner = i; - d->nci = nci; - - register_ten_handler (d->r, dvblo_handle_ten, d); - register_ts_handler (d->r, dvblo_handle_ts, d); - - info ("Starting thread for tuner UUID %s [%s] at device %d with type %d\n", d->uuid, nci->tuner[i].fe_info.name, nci->tuner[i].slot, nci->tuner[i].fe_info.type); - int ret = pthread_create (&d->dvblo_recv_thread, NULL, dvblo_recv, d); - while (!ret && !d->recv_run) { - usleep (10000); - } - if (ret) { - err ("pthread_create failed with %d\n", ret); - } - } - } - if (write_conf) { - if (reload || (nci_num != nc_list->nci_num)) { - nci_num = nc_list->nci_num; - diseqc_write_conf (cmd.disec_conf_path, cmd.rotor_conf_path, &devs, cmd.vdrdiseqcmode); - reload = 0; - } - } - nc_unlock_list (); - sleep (1); - } -} diff --git a/mcast/client/.svn/text-base/dvblo_handler.h.svn-base b/mcast/client/.svn/text-base/dvblo_handler.h.svn-base deleted file mode 100644 index beaa7ac..0000000 --- a/mcast/client/.svn/text-base/dvblo_handler.h.svn-base +++ /dev/null @@ -1,40 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -#define MAX_DEVICES 8 - -typedef struct dvblo_dev { - struct list list; - - pthread_t dvblo_recv_thread; - char uuid[UUID_SIZE]; - int device; - int fd; - pthread_t dvblo_ca_thread; - int fd_ca; - int recv_run; - int ci_slot; - int ca_enable; - - fe_type_t type; - recv_info_t *r; - ci_dev_t *c; - struct dvb_frontend_info info; - dvblo_cacaps_t *cacaps; - dvblo_pids_t pids; - dvb_pid_t dstpids[RECV_MAX_PIDS]; - dvblo_sec_t sec; - struct dvb_frontend_parameters fe_parms; - tra_t ten; - int tuner; - netceiver_info_t *nci; -} dvblo_dev_t; - -int dvblo_init (void); -void dvblo_exit (void); -void dvblo_handler (void); diff --git a/mcast/client/.svn/text-base/headers.h.svn-base b/mcast/client/.svn/text-base/headers.h.svn-base deleted file mode 100644 index c371395..0000000 --- a/mcast/client/.svn/text-base/headers.h.svn-base +++ /dev/null @@ -1,32 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -#ifndef __HEADERS_H__ -#define __HEADERS_H__ - -#include "defs.h" -#include "version.h" -#include "list.h" -#include "satlists.h" -#include "mcast.h" -#include "input.h" -#include "recv_ccpp.h" -#include "recv_tv.h" -#include "tools.h" -#include "interfaces.h" -#include "mcast.h" -#include "mld.h" -#include "api_server.h" -#include "tca_handler.h" -#include "tra_handler.h" -#include "mld_reporter.h" -#include "ciparser.h" -#include "ci_handler.h" -#include "mmi_handler.h" -#include "siparser.h" -#endif diff --git a/mcast/client/.svn/text-base/inet_aton.c.svn-base b/mcast/client/.svn/text-base/inet_aton.c.svn-base deleted file mode 100644 index 1fd34cc..0000000 --- a/mcast/client/.svn/text-base/inet_aton.c.svn-base +++ /dev/null @@ -1 +0,0 @@ -link ../common/win32/inet_aton.c \ No newline at end of file diff --git a/mcast/client/.svn/text-base/inet_ntop.c.svn-base b/mcast/client/.svn/text-base/inet_ntop.c.svn-base deleted file mode 100644 index d11af10..0000000 --- a/mcast/client/.svn/text-base/inet_ntop.c.svn-base +++ /dev/null @@ -1 +0,0 @@ -link ../common/win32/inet_ntop.c \ No newline at end of file diff --git a/mcast/client/.svn/text-base/inet_pton.c.svn-base b/mcast/client/.svn/text-base/inet_pton.c.svn-base deleted file mode 100644 index 7956a55..0000000 --- a/mcast/client/.svn/text-base/inet_pton.c.svn-base +++ /dev/null @@ -1 +0,0 @@ -link ../common/win32/inet_pton.c \ No newline at end of file diff --git a/mcast/client/.svn/text-base/input.c.svn-base b/mcast/client/.svn/text-base/input.c.svn-base deleted file mode 100644 index f10cf4f..0000000 --- a/mcast/client/.svn/text-base/input.c.svn-base +++ /dev/null @@ -1,145 +0,0 @@ -/* - * (c) BayCom GmbH, http://www.baycom.de, info@baycom.de - * - * See the COPYING file for copyright information and - * how to reach the author. - * - */ - -#include "headers.h" -#define CI_RESET_WAIT 10 - -#ifdef __MINGW32__ -#include -#endif - -cmdline_t cmd; - -//-------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -static void print_help (int argc, char *argv[]) -{ - printf ("Usage:\n" \ - " mcli --ifname \n" \ - " mcli --port (default: -port 23000)\n" \ - " mcli --dvb-s --dvb-c --dvb-t --atsc --dvb-s2 \n" \ - " limit number of device types (default: 8 of every type)\n" \ - " mcli --diseqc-conf \n" \ - " mcli --rotor-conf \n" \ - " mcli --mld-reporter-disable\n" \ - " mcli --sock-path \n"\ - " mcli --ca-enable \n"\ - " mcli --ci-timeout