Subversion Repositories HomeAutomation

Rev

Rev 1892 | Rev 2101 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 1892 Rev 2002
Line 27... Line 27...
27 
 
 27 
 
28 
    $payload_length = int($payload_length);
 28 
    $payload_length = int($payload_length);
29 
    $payload="";
 29 
    $payload="";
30 
    if ($payload_length > 0)
 30 
    if ($payload_length > 0)
31 
    {
 31 
    {
32 
        read($socket, $payload, $payload_length);
 32 
        read($socket, $payload, $payload_length-1);
33 
    }
 33 
    }
34 
   
 34 
 
35 
    #Pad payload length with 0s
 35 
    #Pad payload length with 0s
36 
    $payload_length = sprintf("%04d", $payload_length);
 36 
    $payload_length = sprintf("%04d", $payload_length-1);
37 
   
 37 
   
38 
    #print "areadpacket ".$command . $payload_length . $payload."\n";
 38 
    #print "areadpacket ".$command . $payload_length . $payload."\n";
39 
    return $command . $payload_length . $payload;
 39 
    return $command . $payload_length . $payload;
40 
}
 40 
}
41 
 
 41 
 
42 
sub atomd_write_packet
 42 
sub atomd_write_packet
43 
{
 43 
{
44 
    ($socket, $command, $payload) = @_;
 44 
    ($socket, $command, $payload) = @_;
45 
   
 45 
   
46 
    #Pad payload length with 0s
 46 
    #Pad payload length with 0s
47 
    $payload_length = sprintf("%04d", length($payload)+1);
 47 
#   $payload_length = sprintf("%04d", length($payload)+1);
48 
    $packet = $command.$payload_length.$payload.chr(0);
 48 
#   $packet = $command.$payload_length.$payload.chr(0);
- 
 
 49 
    $payload_length = sprintf("%04d", length($payload));
- 
 
 50 
    $packet = $command.$payload_length.$payload;
49 
 
 51 
 
50 
    #print "awritepacket ".$packet."\n";
 52 
    #print "awritepacket ".$packet."\n";
51 
    print $socket $packet;
 53 
    print $socket $packet;
52 
}
 54 
}
53 
 
 55 
 
Line 111... Line 113...
111 
        {
 113 
        {
112 
            last;
 114 
            last;
113 
        }
 115 
        }
114 
 
 116 
 
115 
        $packet =~ s/\n//g;
 117 
        $packet =~ s/\n//g;
116 
        $response .= substr($packet, 8, -1);
 118 
#       $response .= substr($packet, 8, -1);
- 
 
 119 
        $response .= substr($packet, 8);
117 
        $response .= "\n";
 120 
        $response .= "\n";
118 
    }
 121 
    }
119 
 
 122 
 
120 
    return $response;
 123 
    return $response;
121 
}
 124 
}
- 
 
 125 
 
- 
 
 126 
 
- 
 
 127 
# Perl trim function to remove whitespace from the start and end of the string
- 
 
 128 
sub trim($)
- 
 
 129 
{
- 
 
 130 
    my $string = shift;
- 
 
 131 
    $string =~ s/^\s+//;
- 
 
 132 
    $string =~ s/\s+$//;
- 
 
 133 
    return $string;
- 
 
 134 
}
- 
 
 135 
# Left trim function to remove leading whitespace
- 
 
 136 
sub ltrim($)
- 
 
 137 
{
- 
 
 138 
    my $string = shift;
- 
 
 139 
    $string =~ s/^\s+//;
- 
 
 140 
    return $string;
- 
 
 141 
}
- 
 
 142 
# Right trim function to remove trailing whitespace
- 
 
 143 
sub rtrim($)
- 
 
 144 
{
- 
 
 145 
    my $string = shift;
- 
 
 146 
    $string =~ s/\s+$//;
- 
 
 147 
    return $string;
- 
 
 148 
}
- 
 
 149 
 
- 
 
 150 
 
122 
 
 151 
 
123 
# "return" 1 to not generate an error when loading file
 152 
# "return" 1 to not generate an error when loading file
124 
1;
 153 
1;
125 
 
 154