Changeset 5534:ea9da1d777c7 in roaraudio

Timestamp:

06/12/12 14:59:42 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Done more hardending work.

Files:

• ChangeLog (modified) (1 diff)
• roarclients/roarbidir.c (modified) (1 diff)
• roarclients/roarcat.c (modified) (1 diff)
• roarclients/roarcat2sock.c (modified) (1 diff)
• roarclients/roarcatad.c (modified) (1 diff)
• roarclients/roarcatplay.c (modified) (1 diff)
• roarclients/roarcatsendfile.c (modified) (1 diff)
• roarclients/roarcatvio.c (modified) (1 diff)
• roarclients/roarclientpass.c (modified) (2 diffs)
• roarclients/roarctl.c (modified) (1 diff)
• roarclients/roardtmf.c (modified) (1 diff)
• roarclients/roarfilt.c (modified) (1 diff)
• roarclients/roarinterconnect.c (modified) (1 diff)
• roarclients/roarlight.c (modified) (1 diff)
• roarclients/roarmon.c (modified) (1 diff)
• roarclients/roarmonhttp.c (modified) (1 diff)
• roarclients/roarphone.c (modified) (2 diffs)
• roarclients/roarpluginrunner.c (modified) (1 diff)
• roarclients/roarradio.c (modified) (1 diff)
• roarclients/roarshout.c (modified) (2 diffs)
• roarclients/roarsocktypes.c (modified) (1 diff)
• roarclients/roartypes.c (modified) (1 diff)
• roarclients/roarvio.c (modified) (2 diffs)
• roarclients/roarvorbis.c (modified) (4 diffs)
• roarclients/roarvumeter.c (modified) (1 diff)

ChangeLog

@@ -4 +4 @@
         * Fixed usage of -R/-B/-C/-E as well as --aiprofile in roarclients
           (Closes: #176)
+        * Done more hardending work.
 
 v. 1.0beta2 - Wed Jun 06 2012 19:56 CEST

roarclients/roarbidir.c

@@ -46 +46 @@
 int main (int argc, char * argv[]) {
  struct roar_audio_info info;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
  struct roar_vio_defaults  def;

roarclients/roarcat.c

@@ -61 +61 @@
  int    rel_id   = -1;
  int    role     = ROAR_ROLE_UNKNOWN;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
- char * name = "roarcat";
+ const char * name = "roarcat";
  struct roar_connection    con;
  struct roar_stream        s;

roarclients/roarcat2sock.c

@@ -47 +47 @@
  int    channels = 2;
  int    codec    = ROAR_CODEC_DEFAULT;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
  int    fh;

roarclients/roarcatad.c

@@ -47 +47 @@
  int    channels = 2;
  int    codec    = ROAR_CODEC_DEFAULT;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
  char buf[BUFSIZE];

roarclients/roarcatplay.c

@@ -42 +42 @@
 
 int main (int argc, char * argv[]) {
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
- char * file    = NULL;
+ const char * file    = NULL;
  int    verbose = 0;
  roar_vs_t * vss;

roarclients/roarcatsendfile.c

@@ -48 +48 @@
  int    channels = 2;
  int    codec    = ROAR_CODEC_DEFAULT;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    fh;
  int    i;

roarclients/roarcatvio.c

@@ -50 +50 @@
                                 .codec = ROAR_AUDIO_INFO_INVALID};
  int    auinfo_changed = 0;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
- char * name = "roarcatvio";
+ const char * name = "roarcatvio";
  roar_vs_t * vss;
- char * filename = NULL;
+ const char * filename = NULL;
  int err;
 

roarclients/roarclientpass.c

@@ -115 +115 @@
  struct roar_connection    con;
  struct roar_client        client;
- char * server    = NULL;
- char * k;
+ const char * server    = NULL;
+ const char * k;
  int    i;
  int    clientfh  = -1;
@@ -125 +125 @@
  int    mode      = ROAR_SOCKET_MODE_NONE;
  int    type      = ROAR_SOCKET_TYPE_UNKNOWN;
- char * host      = NULL;
+ const char * host      = NULL;
  int    port      = -1;
  enum {PASSFH, EXEC} command = PASSFH;

roarclients/roarctl.c

@@ -1195 +1195 @@
 int main (int argc, char * argv[]) {
  struct roar_connection con;
- char * server   = NULL;
- char * k = NULL;
+ const char * server   = NULL;
+ const char * k = NULL;
  int    i;
  int    t = 0;

roarclients/roardtmf.c

@@ -122 +122 @@
 int main (int argc, char * argv[]) {
  int    rate     = ROAR_RATE_DEFAULT;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
- char * name = "roardtmf";
+ const char * name = "roardtmf";
  roar_vs_t * vss = NULL;
- char * tones = NULL;
+ const char * tones = NULL;
  void * buf;
  size_t samples;

roarclients/roarfilt.c

@@ -138 +138 @@
 int main (int argc, char * argv[]) {
  struct roar_audio_info info;
- char  * server   = NULL;
- char  * k;
+ const char  * server   = NULL;
+ const char  * k;
  int     i;
  int32_t mul = 1, div = 1;

roarclients/roarinterconnect.c

@@ -265 +265 @@
  int    type     = parse_type(NULL);
  int    tmp;
- char * server   = NULL;
+ const char * server   = NULL;
  char * remote   = "+slp"; // we hope SLP located server is not local one
  char * k;

roarclients/roarlight.c

@@ -97 +97 @@
  struct roar_connection con;
  int    mixer = -1; // -1 = Default
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
 

roarclients/roarmon.c

@@ -62 +62 @@
  int    dir      = ROAR_DIR_MONITOR;
  int    rel_id   = -1;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
  int    prethru  = 0;

roarclients/roarmonhttp.c

@@ -236 +236 @@
  int    sflags   = ROAR_FLAG_NONE;
 // int    codec    = ROAR_CODEC_DEFAULT;
- char * server   = NULL;
+ const char * server   = NULL;
  int    i;
- char * c, * k, * v;
+ const char * k, * v;
+ char * c;
  char * sp0 = NULL, * sp1 = NULL;
  int dir = ROAR_DIR_MONITOR;

roarclients/roarphone.c

@@ -156 +156 @@
 }
 
-int open_stream (struct roar_vio_calls * vio, char * server, struct roar_audio_info * info) {
+int open_stream (struct roar_vio_calls * vio, const char * server, struct roar_audio_info * info) {
  int fh;
 
@@ -404 +404 @@
  struct roar_vio_calls * svio_p;
  struct roardsp_filter * filter;
- char * driver   = DRIVER;
- char * device   = NULL;
- char * server   = NULL;
- char * k;
+ const char * driver   = DRIVER;
+ const char * device   = NULL;
+ const char * server   = NULL;
+ const char * k;
  int    i;
  union {

roarclients/roarpluginrunner.c

@@ -420 +420 @@
  int ret = 0;
  int i;
- char * k;
+ const char * k;
 
  for (i = 1; i < argc; i++) {

roarclients/roarradio.c

@@ -53 +53 @@
 int main (int argc, char * argv[]) {
  struct roar_audio_info info;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  int    i;
  int    in = -1;

roarclients/roarshout.c

@@ -93 +93 @@
  enum { ARG, ASK, DSTR } pw_source = ARG;
  struct roar_audio_info info;
- char * server   = NULL;
- char * k;
- char * s_server = NULL;
- char * s_mount  = NULL;
+ const char * server   = NULL;
+ const char * k;
+ const char * s_server = NULL;
+ const char * s_mount  = NULL;
  char * s_pw     = NULL;
  int    s_port   = -1;
- char * s_desc   = NULL;
- char * s_genre  = NULL;
- char * s_name   = NULL;
- char * s_url    = NULL;
+ const char * s_desc   = NULL;
+ const char * s_genre  = NULL;
+ const char * s_name   = NULL;
+ const char * s_url    = NULL;
  int    s_public = 0;
  roar_vs_t * vss;
@@ -159 +159 @@
    s_port   = atoi(k);
   } else if ( s_pw     == NULL ) {
-   s_pw     = k;
+   s_pw     = argv[i]; // do not use k here so k can be const.
   } else if ( s_mount  == NULL ) {
    s_mount  = k;

roarclients/roarsocktypes.c

@@ -26 +26 @@
 #include <roaraudio.h>
 
+static const struct {
+ const char * name;
+ int (*func)(void);
+} tests[] = {
+ {"TCPv4"           , roar_socket_new_tcp },
+ {"UDPv4"           , roar_socket_new_udp },
+ {"TCPv6"           , roar_socket_new_tcp6},
+ {"UDPv6"           , roar_socket_new_udp6},
+ {"UNIX"            , roar_socket_new_unix},
+ {"DECnet seqpacket", roar_socket_new_decnet_seqpacket},
+ {"DECnet stream"   , roar_socket_new_decnet_stream},
+ {"IPX"             , roar_socket_new_ipx},
+ {"IPX/SPX"         , roar_socket_new_ipxspx},
+ {NULL, NULL}
+};
+
 int main (int argc, char * argv[]) {
  int i, fh;
- struct {
-  char * name;
-  int (*func)(void);
- } tests[] = {
-  {"TCPv4"           , roar_socket_new_tcp },
-  {"UDPv4"           , roar_socket_new_udp },
-  {"TCPv6"           , roar_socket_new_tcp6},
-  {"UDPv6"           , roar_socket_new_udp6},
-  {"UNIX"            , roar_socket_new_unix},
-  {"DECnet seqpacket", roar_socket_new_decnet_seqpacket},
-  {"DECnet stream"   , roar_socket_new_decnet_stream},
-  {"IPX"             , roar_socket_new_ipx},
-  {"IPX/SPX"         , roar_socket_new_ipxspx},
-  {NULL, NULL}
- };
 
  roar_debug_bin_obsolete(argv[0], NULL, NULL);

roarclients/roartypes.c

@@ -31 +31 @@
 
 int main (void) {
- struct { char * name; int len; } types[] = {
+ struct { const char * name; int len; } types[] = {
 //  { "roar_buffer",         sizeof(struct roar_buffer)         },
   { "roar_stack",          sizeof(struct roar_stack)          },

roarclients/roarvio.c

@@ -59 +59 @@
  int level = 0;
  int fh;
- char * name;
+ const char * name;
  const char * codec;
- char * content_type;
+ const char * content_type;
 
  while (cur != NULL) {
@@ -163 +163 @@
  ssize_t written = -1;
  int i;
- char * k;
- char * file0 = NULL;
- char * file1 = NULL;
+ const char * k;
+ const char * file0 = NULL;
+ const char * file1 = NULL;
  int o_flags = -1;
  int ret = 0;

roarclients/roarvorbis.c

@@ -97 +97 @@
                    roar_vs_t              ** vss,
                    OggVorbis_File         *  vf,
-                   char                   *  file,
+                   const char             *  file,
                    struct roar_audio_info *  info,
                    struct roar_vio_calls  *  vclt) {
@@ -288 +288 @@
  struct roar_vio_calls vclt, in;
  struct roar_vio_defaults def;
- char * server   = NULL;
- char * file     = NULL;
- char * vcltfile = NULL;
- char * k;
+ const char * file     = NULL;
+ const char * vcltfile = NULL;
+ const char * k;
  int    i;
  struct roar_connection con;
@@ -310 +309 @@
 
   if ( strcmp(k, "--server") == 0 ) {
-   server = argv[++i];
+   roar_libroar_set_server(argv[++i]);
   } else if ( strcmp(k, "--vclt-out") == 0 ) {
    vcltfile = argv[++i];
@@ -325 +324 @@
  }
 
- roar_libroar_set_server(server);
-
  if ( file == NULL ) {
   ROAR_ERR("No filename given.");

roarclients/roarvumeter.c

@@ -166 +166 @@
  struct roar_audio_info info;
  int    samples  = -1;
- char * server   = NULL;
- char * k;
+ const char * server   = NULL;
+ const char * k;
  struct roar_vio_calls stream, re;
  int    i;