Update SMUX library.

[stg.git] / libs / smux / include / stg / per_support.h

diff --git a/libs/smux/include/stg/per_support.h b/libs/smux/include/stg/per_support.h
index 420bb83c58d081ba3949951b67709e3200e7192a..a75ac94fc4a98ed41e4b32c4a1c31d66446c1121 100644 (file)
--- a/libs/smux/include/stg/per_support.h
+++ b/libs/smux/include/stg/per_support.h
@@ -1,5 +1,6 @@
 /*
 /*

- * Copyright (c) 2005, 2006 Lev Walkin <vlm@lionet.info>. All rights reserved.
+ * Copyright (c) 2005-2014 Lev Walkin <vlm@lionet.info>.
+ * All rights reserved.

  * Redistribution and modifications are permitted subject to BSD license.
  */
 #ifndef        _PER_SUPPORT_H_
  * Redistribution and modifications are permitted subject to BSD license.
  */
 #ifndef        _PER_SUPPORT_H_


@@ -14,7 +15,7 @@ extern "C" {
 /*
  * Pre-computed PER constraints.
  */
 /*
  * Pre-computed PER constraints.
  */

-typedef struct asn_per_constraint_s {
+typedef const struct asn_per_constraint_s {

        enum asn_per_constraint_flags {
                APC_UNCONSTRAINED       = 0x0,  /* No PER visible constraints */
                APC_SEMI_CONSTRAINED    = 0x1,  /* Constrained at "lb" */
        enum asn_per_constraint_flags {
                APC_UNCONSTRAINED       = 0x0,  /* No PER visible constraints */
                APC_SEMI_CONSTRAINED    = 0x1,  /* Constrained at "lb" */


@@ -26,18 +27,23 @@ typedef struct asn_per_constraint_s {
        long lower_bound;               /* "lb" value */
        long upper_bound;               /* "ub" value */
 } asn_per_constraint_t;
        long lower_bound;               /* "lb" value */
        long upper_bound;               /* "ub" value */
 } asn_per_constraint_t;

-typedef struct asn_per_constraints_s {
-       asn_per_constraint_t value;
-       asn_per_constraint_t size;
+typedef const struct asn_per_constraints_s {
+       struct asn_per_constraint_s value;
+       struct asn_per_constraint_s size;
+       int (*value2code)(unsigned int value);
+       int (*code2value)(unsigned int code);

 } asn_per_constraints_t;
 
 /*
  * This structure describes a position inside an incoming PER bit stream.
  */
 typedef struct asn_per_data_s {
 } asn_per_constraints_t;
 
 /*
  * This structure describes a position inside an incoming PER bit stream.
  */
 typedef struct asn_per_data_s {

- const uint8_t *buffer;        /* Pointer to the octet stream */
-        size_t  nboff; /* Bit offset to the meaningful bit */
-        size_t  nbits; /* Number of bits in the stream */
+  const uint8_t *buffer;  /* Pointer to the octet stream */
+         size_t  nboff;   /* Bit offset to the meaningful bit */
+         size_t  nbits;   /* Number of bits in the stream */
+         size_t  moved;   /* Number of bits moved through this bit stream */
+  int (*refill)(struct asn_per_data_s *);
+  void *refill_key;

 } asn_per_data_t;
 
 /*
 } asn_per_data_t;
 
 /*


@@ -47,6 +53,9 @@ typedef struct asn_per_data_s {
  */
 int32_t per_get_few_bits(asn_per_data_t *per_data, int get_nbits);
 
  */
 int32_t per_get_few_bits(asn_per_data_t *per_data, int get_nbits);
 

+/* Undo the immediately preceeding "get_few_bits" operation */
+void per_get_undo(asn_per_data_t *per_data, int get_nbits);
+

 /*
  * Extract a large number of bits from the specified PER data pointer.
  * This function returns -1 if the specified number of bits could not be
 /*
  * Extract a large number of bits from the specified PER data pointer.
  * This function returns -1 if the specified number of bits could not be


@@ -62,11 +71,22 @@ ssize_t uper_get_length(asn_per_data_t *pd,
                        int effective_bound_bits,
                        int *repeat);
 
                        int effective_bound_bits,
                        int *repeat);
 

+/*
+ * Get the normally small length "n".
+ */
+ssize_t uper_get_nslength(asn_per_data_t *pd);
+

 /*
  * Get the normally small non-negative whole number.
  */
 ssize_t uper_get_nsnnwn(asn_per_data_t *pd);
 
 /*
  * Get the normally small non-negative whole number.
  */
 ssize_t uper_get_nsnnwn(asn_per_data_t *pd);
 

+/* X.691-2008/11, #11.5.6 */
+int uper_get_constrained_whole_number(asn_per_data_t *pd, unsigned long *v, int nbits);
+
+/* Non-thread-safe debugging function, don't use it */
+char *per_data_string(asn_per_data_t *pd);
+

 /*
  * This structure supports forming PER output.
  */
 /*
  * This structure supports forming PER output.
  */


@@ -86,6 +106,10 @@ int per_put_few_bits(asn_per_outp_t *per_data, uint32_t bits, int obits);
 /* Output a large number of bits */
 int per_put_many_bits(asn_per_outp_t *po, const uint8_t *src, int put_nbits);
 
 /* Output a large number of bits */
 int per_put_many_bits(asn_per_outp_t *po, const uint8_t *src, int put_nbits);
 

+/* X.691-2008/11, #11.5 */
+int uper_put_constrained_whole_number_s(asn_per_outp_t *po, long v, int nbits);
+int uper_put_constrained_whole_number_u(asn_per_outp_t *po, unsigned long v, int nbits);
+

 /*
  * Put the length "n" to the Unaligned PER stream.
  * This function returns the number of units which may be flushed
 /*
  * Put the length "n" to the Unaligned PER stream.
  * This function returns the number of units which may be flushed


@@ -93,6 +117,12 @@ int per_put_many_bits(asn_per_outp_t *po, const uint8_t *src, int put_nbits);
  */
 ssize_t uper_put_length(asn_per_outp_t *po, size_t whole_length);
 
  */
 ssize_t uper_put_length(asn_per_outp_t *po, size_t whole_length);
 

+/*
+ * Put the normally small length "n" to the Unaligned PER stream.
+ * Returns 0 or -1.
+ */
+int uper_put_nslength(asn_per_outp_t *po, size_t length);
+

 /*
  * Put the normally small non-negative whole number.
  */
 /*
  * Put the normally small non-negative whole number.
  */