Permalink
Browse files

Merge pull request #167 from mcoms/master

Verbose mode logs incorrect IP / fix for paths with spaces in
  • Loading branch information...
2 parents 4746bb1 + f2b52ea commit eb8dad53172ab753aee4f4bf02d0f141b9144d08 @albertz committed Mar 12, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 shairport.pl
View
@@ -495,7 +495,7 @@ sub performSqueezeboxSetup {
foreach my $fh (@waiting) {
if ($fh==$listen) {
my $new = $listen->accept;
- printf "New connection from %s\n", $new->sockhost if $verbose;
+ printf "New connection from %s\n", $new->peerhost if $verbose;
$sel->add($new);
$new->blocking(0);
@@ -673,7 +673,7 @@ sub conn_handle_request {
$dec_args{ao_devicename} = $libao_devicename if defined $libao_devicename;
$dec_args{ao_deviceid} = $libao_deviceid if defined $libao_deviceid;
- my $dec = $hairtunes_cli . join(' ', '', map { sprintf "%s '%s'", $_, $dec_args{$_} } keys(%dec_args));
+ my $dec = '"' . $hairtunes_cli . '"' . join(' ', '', map { sprintf "%s '%s'", $_, $dec_args{$_} } keys(%dec_args));
# print "decode command: $dec\n";
my $decoder = open2(my $dec_out, my $dec_in, $dec);

0 comments on commit eb8dad5

Please sign in to comment.