Moved utility functions from Sip::Msgtype to here.

diff --git a/Sip.pm b/Sip.pm
index 41ce735..baa214d 100644 (file)
--- a/Sip.pm
+++ b/Sip.pm
@@ -12,9 +12,112 @@ use POSIX qw(strftime);
 use Sip::Constants qw(SIP_DATETIME);
 our @ISA = qw(Exporter);
 
-our @EXPORT_OK = qw(y_or_n timestamp);
+our @EXPORT_OK = qw(y_or_n timestamp add_field maybe_add denied sipbool
+                   boolspace write_msg
+                   $error_detection $protocol_version $field_delimiter);
+
+our %EXPORT_TAGS = (
+                   all => [qw(y_or_n timestamp add_field maybe_add
+                              denied sipbool boolspace write_msg
+                              $error_detection $protocol_version
+                              $field_delimiter)]);
+
+
+our $error_detection = 0;
+our $protocol_version = "1.00";
+our $field_delimiter = '|';    # Protocol Default
 
 sub timestamp {
     return strftime(SIP_DATETIME, localtime());
 }
+
+#
+# add_field(field_id, value)
+#    return constructed field value
+#
+sub add_field {
+    my ($field_id, $value) = @_;
+
+    return $field_id . $value . $field_delimiter;
+}
+#
+# maybe_add(field_id, value):
+#    If value is defined and non-empty, then return the
+#    constructed field value, otherwise return the empty string
+#
+sub maybe_add {
+    my ($fid, $value) = @_;
+
+    return (defined($value) && $value) ? add_field($fid, $value) : '';
+}
+
+#
+# denied($bool)
+# if $bool is false, return true.  This is because SIP statuses
+# are inverted:  we report that something has been denied, not that
+# it's permitted.  For example, 'renewal priv. denied' of 'Y' means
+# that the user's not permitted to renew.  I assume that the ILS has
+# real positive tests.
+# 
+sub denied {
+    my $bool = shift;
+
+    if (!$bool || ($bool eq 'N') || $bool eq 'False') {
+       return 'Y';
+    } else {
+       return ' ';
+    }
+}
+
+sub sipbool {
+    my $bool = shift;
+
+    if (!$bool || ($bool =~/^false|n|no$/i)) {
+       return('N');
+    } else {
+       return('Y');
+    }
+}
+
+#
+# boolspace: ' ' is false, 'Y' is true. (don't ask)
+# 
+sub boolspace {
+    my $bool = shift;
+
+    if (!$bool || ($bool eq 'N' || $bool eq 'False')) {
+       return ' ';
+    } else {
+       return 'Y';
+    }
+}
+
+
+#
+# write_msg($msg, $server)
+#
+# Send $msg to the SC.  If error detection is active, then 
+# add the sequence number (if $seqno is non-zero) and checksum
+# to the message, and save the whole thing as $last_response
+#
+
+sub write_msg {
+    my ($self, $msg, $server) = @_;
+    my $cksum;
+
+    if ($error_detection) {
+       if ($self->{seqno}) {
+           $msg .= 'AY' . $self->{seqno};
+       }
+       $msg .= 'AZ';
+       $cksum = checksum($msg);
+       $msg .= sprintf('%4X', $cksum);
+    }
+
+    syslog("LOG_DEBUG", "OUTPUT MSG: '$msg'");
+
+    print "$msg\r";
+    $last_response = $msg;
+}
+
 1;