Add newcamd protocol support.

ChangeLog

@@ -10,6 +10,7 @@ xxxx-xx-xx : Version next
  * Add --output-nit-pass (-y) to enable NIT pass through.
  * Add --output-eit-pass (-w) to enable EIT (EPG) pass through.
  * Add --output-tdt-pass (-x) to enable TDT/TOT pass through.
+ * Add support for newcamd CAMD protocol.
 
 2011-11-18 : Version 4.0
  * Set CAMD sockets NODELAY to avoid OSCAM errors when many packets are sent.

Makefile

@@ -40,11 +40,12 @@ tsdecrypt_SRC = data.c \
  util.c \
  camd.c \
  camd-cs378x.c \
+ camd-newcamd.c \
  process.c \
  tables.c \
  notify.c \
  tsdecrypt.c
-tsdecrypt_LIBS = -lcrypto -ldvbcsa -lpthread
+tsdecrypt_LIBS = -lcrypt -lcrypto -ldvbcsa -lpthread
 tsdecrypt_OBJS = $(FUNCS_LIB) $(TS_LIB) $(tsdecrypt_SRC:.c=.o)
 
 CLEAN_OBJS = tsdecrypt $(tsdecrypt_SRC:.c=.{o,d})

README

@@ -2,8 +2,8 @@ tsdecrypt
 =========
 tsdecrypt reads incoming mpeg transport stream over UDP/RTP and then
 decrypts it using libdvbcsa and keys obtained from OSCAM or similar cam
-server. tsdecrypt communicates with CAM server using camd35 over tcp
-protocol also known as cs378x.
+server. tsdecrypt communicates with CAM server using cs378x (camd35 over
+tcp) protocol or newcamd protocol.
 
 License
 =======
@@ -58,9 +58,13 @@ CA options:
  -C --caid <caid>           | Set CAID. Default: Taken from --ca-system.
 
 CAMD server options:
+ -A --camd-proto <proto>    | Set CAMD network protocol.
+                            . Valid protocols are: CS378X (default) and NEWCAMD
  -s --camd-server <addr>    | Set CAMD server ip_address:port (1.2.3.4:2233).
  -U --camd-user <user>      | Set CAMD server user. Default: user
  -P --camd-pass <pass>      | Set CAMD server password. Default: pass
+ -B --camd-des-key <key>    | Set DES key for newcamd protocol.
+                            . Default: 0102030405060708091011121314
 
 EMM options:
  -e --emm                   | Enable sending EMM's to CAMD. Default: disabled