projects
/
Biblio-RFID.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
read programmed cards directly from log
[Biblio-RFID.git]
/
scripts
/
RFID-JSONP-server.pl
diff --git
a/scripts/RFID-JSONP-server.pl
b/scripts/RFID-JSONP-server.pl
index
0428c51
..
4a6be06
100755
(executable)
--- a/
scripts/RFID-JSONP-server.pl
+++ b/
scripts/RFID-JSONP-server.pl
@@
-1,12
+1,12
@@
#!/usr/bin/perl
#!/usr/bin/perl
-=head1
RFID-JSONP-server
+=head1
NAME
-
This is
simpliest possible JSONP server which provides local web interface to RFID readers
+
RFID-JSONP-server -
simpliest possible JSONP server which provides local web interface to RFID readers
-Usage:
+=head1 USAGE
- ./scripts/RFID-JSONP-server.pl
+ ./scripts/RFID-JSONP-server.pl
[--debug] [--listen=127.0.0.1:9000] [--reader=filter]
=cut
=cut
@@
-19,16
+19,21
@@
use JSON::XS;
use IO::Socket::INET;
my $debug = 1;
use IO::Socket::INET;
my $debug = 1;
+my $listen = '127.0.0.1:9000';
+my $reader;
-my $listen_port = 9000; # pick something not in use
-my $server_url = "http://localhost:$listen_port";
+use Getopt::Long;
-my $reader = shift @ARGV;
+GetOptions(
+ 'debug!' => \$debug,
+ 'listen=s', => \$listen,
+ 'reader=s', => \$reader,
+) || die $!;
use lib 'lib';
use lib 'lib';
-use
RFID::Biblio
::RFID501;
-use
RFID::Biblio::Readers
;
-my $rfid =
(RFID::Biblio::Readers->available( $reader ))[0]; # FIXME
+use
Biblio::RFID
::RFID501;
+use
Biblio::RFID::Reader
;
+my $rfid =
Biblio::RFID::Reader->new( shift @ARGV );
my $index_html;
{
my $index_html;
{
@@
-36,17
+41,20
@@
my $index_html;
$index_html = <DATA>;
}
$index_html = <DATA>;
}
+my $server_url;
+
sub http_server {
my $server = IO::Socket::INET->new(
Proto => 'tcp',
sub http_server {
my $server = IO::Socket::INET->new(
Proto => 'tcp',
- Local
Port => $listen_port
,
+ Local
Addr => $listen
,
Listen => SOMAXCONN,
Reuse => 1
);
die "can't setup server: $!" unless $server;
Listen => SOMAXCONN,
Reuse => 1
);
die "can't setup server: $!" unless $server;
+ $server_url = 'http://' . $listen;
print "Server $0 ready at $server_url\n";
while (my $client = $server->accept()) {
print "Server $0 ready at $server_url\n";
while (my $client = $server->accept()) {
@@
-86,12
+94,12
@@
sub http_server {
close($fh);
}
} elsif ( $method =~ m{/scan} ) {
close($fh);
}
} elsif ( $method =~ m{/scan} ) {
- my
$tags = $rfid->scan
;
+ my
@tags = $rfid->tags
;
my $json = { time => time() };
my $json = { time => time() };
- foreach my $tag (
keys %$
tags ) {
- my $hash =
RFID::Biblio::RFID501->to_hash( $tags->{$tag}
);
+ foreach my $tag (
@
tags ) {
+ my $hash =
Biblio::RFID::RFID501->to_hash( $rfid->blocks( $tag )
);
$hash->{sid} = $tag;
$hash->{sid} = $tag;
- $hash->{security} = uc unpack 'H*', $rfid->
read_
afi( $tag );
+ $hash->{security} = uc unpack 'H*', $rfid->afi( $tag );
push @{ $json->{tags} }, $hash;
};
warn "#### ", encode_json($json);
push @{ $json->{tags} }, $hash;
};
warn "#### ", encode_json($json);
@@
-104,13
+112,13
@@
sub http_server {
foreach my $p ( keys %$param ) {
next unless $p =~ m/^(E[0-9A-F]{15})$/;
my $tag = $1;
foreach my $p ( keys %$param ) {
next unless $p =~ m/^(E[0-9A-F]{15})$/;
my $tag = $1;
- my $content =
"\x04\x11\x00\x01" . $param->{$p}
;
- $content
= "\x00"
if $param->{$p} eq 'blank';
+ my $content =
Biblio::RFID::RFID501->from_hash({ content => $param->{$p} })
;
+ $content
= Biblio::RFID::RFID501->blank
if $param->{$p} eq 'blank';
$status = 302;
warn "PROGRAM $tag $content\n";
$status = 302;
warn "PROGRAM $tag $content\n";
-
write_tag( $tag,
$content );
-
secure_tag_with( $tag, $param->{$p} =~ /^130/ ? 'DA' : 'D7'
);
+
$rfid->write_blocks( $tag =>
$content );
+
$rfid->write_afi( $tag => chr( $param->{$p} =~ /^130/ ? 0xDA : 0xD7 )
);
}
print $client "HTTP/1.0 $status $method\r\nLocation: $server_url\r\n\r\n";
}
print $client "HTTP/1.0 $status $method\r\nLocation: $server_url\r\n\r\n";
@@
-128,7
+136,7
@@
sub http_server {
$status = 302;
warn "SECURE $tag $data\n";
$status = 302;
warn "SECURE $tag $data\n";
-
secure_tag_with( $tag, $data
);
+
$rfid->write_afi( $tag => hex($data)
);
}
if ( $json ) {
}
if ( $json ) {