Compare commits
12 Commits
main
...
creation-s
| Author | SHA1 | Date | |
|---|---|---|---|
07eae87855
|
|||
|
080537fe6d
|
|||
|
ecd84bf242
|
|||
|
981a5d34c5
|
|||
|
681cc7cb83
|
|||
|
fbc3be564f
|
|||
|
4871187726
|
|||
|
67b482ff13
|
|||
|
34bdea2269
|
|||
|
20e16f6ae2
|
|||
|
f42e38228a
|
|||
|
3712667a04
|
@ -1,3 +1,2 @@
|
|||||||
SESAM_FSV_VERSION=1.40.13
|
SESAM_FSV_VERSION=1.40.13
|
||||||
SESAM_INI_PATH=/etc/opt/santesocial/fsv/${SESAM_FSV_VERSION}/conf/sesam.ini
|
SESAM_INI_PATH=/etc/opt/santesocial/fsv/${SESAM_FSV_VERSION}/conf/sesam.ini
|
||||||
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
|
||||||
|
|||||||
@ -1,3 +1,2 @@
|
|||||||
SESAM_FSV_VERSION=1.40.13
|
SESAM_FSV_VERSION=1.40.13
|
||||||
SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
|
SESAM_INI_PATH=${ALLUSERSPROFILE}\\santesocial\\fsv\\${SESAM_FSV_VERSION}\\conf\\sesam.ini
|
||||||
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
|
||||||
|
|||||||
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -1 +0,0 @@
|
|||||||
Cargo.lock -merge linguist-generated=false
|
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
@ -23,6 +23,3 @@ target/
|
|||||||
|
|
||||||
# Ignore .env files
|
# Ignore .env files
|
||||||
.env
|
.env
|
||||||
|
|
||||||
# Development Database
|
|
||||||
*.sqlite
|
|
||||||
|
|||||||
2439
Cargo.lock
generated
2439
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
14
Cargo.toml
14
Cargo.toml
@ -4,18 +4,6 @@ members = [
|
|||||||
"crates/backend",
|
"crates/backend",
|
||||||
"crates/desktop",
|
"crates/desktop",
|
||||||
"crates/sesam-vitale",
|
"crates/sesam-vitale",
|
||||||
"crates/fsv",
|
"crates/services-sesam-vitale-sys",
|
||||||
"crates/fsv-sys",
|
|
||||||
"crates/utils",
|
"crates/utils",
|
||||||
"migration",
|
|
||||||
"entity",
|
|
||||||
".",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[workspace.dependencies]
|
|
||||||
anyhow = "1.0"
|
|
||||||
dotenv = "0.15"
|
|
||||||
sea-orm-cli = "1.0.1"
|
|
||||||
sea-orm = "1.0.1"
|
|
||||||
serde = { version = "1.0.210", features = ["derive"] }
|
|
||||||
thiserror = "1.0"
|
|
||||||
|
|||||||
53
README.md
53
README.md
@ -9,7 +9,6 @@ Logiciel de Pharmacie libre et open-source.
|
|||||||
- `crates/desktop`: Client desktop propulsé par Tauri, exposant le `frontend`
|
- `crates/desktop`: Client desktop propulsé par Tauri, exposant le `frontend`
|
||||||
- `crates/sesam-vitale`: Bibliothèque de gestion des services SESAM-Vitale (Lecture des cartes CPS et Vitale, téléservices ...)
|
- `crates/sesam-vitale`: Bibliothèque de gestion des services SESAM-Vitale (Lecture des cartes CPS et Vitale, téléservices ...)
|
||||||
- `crates/utils`: Bibliothèque de fonctions utilitaires
|
- `crates/utils`: Bibliothèque de fonctions utilitaires
|
||||||
- `crates/fsv-sys`: Bindings Rust pour les librairies dynamiques FSV (SESAM-Vitale)
|
|
||||||
- `frontend`: Interface web du logiciel, propulsée par Nuxt.js
|
- `frontend`: Interface web du logiciel, propulsée par Nuxt.js
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
@ -44,27 +43,9 @@ La CLI Tauri est nécessaire au lancement du client `desktop`. Elle peut être i
|
|||||||
cargo install tauri-cli --version "^2.0.0-rc"
|
cargo install tauri-cli --version "^2.0.0-rc"
|
||||||
```
|
```
|
||||||
|
|
||||||
#### SeaORM CLI
|
#### SESAM-Vitale
|
||||||
|
|
||||||
SeaORM est notre ORM. Le CLI SeaORM est nécessaire pour la génération des modèles de la base de données et des migrations associées. Elle peut être installée via Cargo :
|
La crate `sesam-vitale` nécessite la présence des librairies dynamiques fournies par le package FSV et la CryptolibCPS. Les instructions d'installation sont disponibles dans le [README](crates/sesam-vitale/README.md) de la crate `sesam-vitale`.
|
||||||
|
|
||||||
```bash
|
|
||||||
cargo install sea-orm-cli
|
|
||||||
```
|
|
||||||
|
|
||||||
L'applicatif va chercher les informations de connexion à la base de données dans la variable `DATABASE_URL` importée depuis les [fichiers de configuration](#fichiers-de-configuration).
|
|
||||||
|
|
||||||
```.env
|
|
||||||
DATABASE_URL=sqlite://p4pillon.sqlite?mode=rwc
|
|
||||||
```
|
|
||||||
|
|
||||||
Toutefois, l'usage de la CLI de SeaORM nécessite de renseigner les informations de connexion à la base de données dans un fichier `.env` situé à la racine du projet.
|
|
||||||
|
|
||||||
> Astuce : utilisé un lien symbolique pour éviter de dupliquer le fichier `.env`.
|
|
||||||
|
|
||||||
#### FSV-sys
|
|
||||||
|
|
||||||
La crate `fsv-sys` nécessite la présence des librairies fournies par le package FSV et la CryptolibCPS. Les instructions d'installation sont disponibles dans le [README](crates/sesam-vitale/README.md) de la crate `fsv-sys`.
|
|
||||||
|
|
||||||
#### Backend Hot-reload
|
#### Backend Hot-reload
|
||||||
|
|
||||||
@ -76,7 +57,7 @@ Pour lancer l'application en mode développement, il est nécessaire d'exécuter
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Lancement du serveur backend
|
# Lancement du serveur backend
|
||||||
systemfd --no-pid -s http::8080 -- cargo watch -w crates/backend -x 'run --bin backend'
|
systemfd --no-pid -s http::3030 -- cargo watch -x 'run --bin backend'
|
||||||
```
|
```
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@ -84,13 +65,9 @@ systemfd --no-pid -s http::8080 -- cargo watch -w crates/backend -x 'run --bin b
|
|||||||
# - frontend (serveur web, accessible via navigateur)
|
# - frontend (serveur web, accessible via navigateur)
|
||||||
bun run --cwd frontend/ dev
|
bun run --cwd frontend/ dev
|
||||||
# - desktop (client desktop, basé sur Tauri)
|
# - desktop (client desktop, basé sur Tauri)
|
||||||
cargo tauri dev --no-watch
|
cargo tauri dev
|
||||||
```
|
```
|
||||||
|
|
||||||
> Pour circonscrire les hot-reloads intempestifs mais peu utiles :
|
|
||||||
> - le `backend` n'est rechargé que si des modifications sont détectées dans le dossier précisé par `-w crates/backend`
|
|
||||||
> - le rechargement du `desktop` est désactivé par l'option `--no-watch` ; en effet, le rechargement du `frontend` est déjà pris en charge par `bun` et ne nécessite pas de rechargement du `desktop`
|
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
Pour packager le client `desktop`, il est nécessaire de faire appel à la CLI Tauri, qui se charge de gérer le build du `frontend` et son intégration au bundle :
|
Pour packager le client `desktop`, il est nécessaire de faire appel à la CLI Tauri, qui se charge de gérer le build du `frontend` et son intégration au bundle :
|
||||||
@ -98,25 +75,3 @@ Pour packager le client `desktop`, il est nécessaire de faire appel à la CLI T
|
|||||||
```bash
|
```bash
|
||||||
cargo tauri build
|
cargo tauri build
|
||||||
```
|
```
|
||||||
|
|
||||||
## Gestion de la base de données
|
|
||||||
|
|
||||||
### Création d'une migration
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sea-orm-cli migrate generate <nom_de_la_migration>
|
|
||||||
```
|
|
||||||
|
|
||||||
Cette commande génère un fichier de migration à adapter dans le dossier `migration/src`.
|
|
||||||
|
|
||||||
### Appliquer les migrations
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sea-orm-cli migrate up
|
|
||||||
```
|
|
||||||
|
|
||||||
### Génération des entitées
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sea-orm-cli generate entity -o entity/src/entities --with-serde both
|
|
||||||
```
|
|
||||||
4
crates/app/.gitignore
vendored
Normal file
4
crates/app/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
/target
|
||||||
|
|
||||||
|
# Tailwind CSS CLI
|
||||||
|
tailwindcss
|
||||||
21
crates/app/Cargo.toml
Normal file
21
crates/app/Cargo.toml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
[package]
|
||||||
|
name = "app"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
askama = "0.12.1"
|
||||||
|
askama_axum = "0.4.0"
|
||||||
|
axum = "0.7.5"
|
||||||
|
axum-htmx = { version = "0.6", features = ["auto-vary"] }
|
||||||
|
listenfd = "1.0.1"
|
||||||
|
notify = "6.1.1"
|
||||||
|
serde = { version = "1.0.204", features = ["derive"] }
|
||||||
|
thiserror = "1.0.63"
|
||||||
|
tokio = { version = "1.39.1", features = ["macros", "rt-multi-thread"] }
|
||||||
|
tower-http = { version = "0.5.2", features = ["fs"] }
|
||||||
|
tower-livereload = "0.9.3"
|
||||||
|
|
||||||
|
[dev-dependencies]
|
||||||
|
cargo-watch = "8.5.1"
|
||||||
|
systemfd = "0.4.0"
|
||||||
35
crates/app/README.md
Normal file
35
crates/app/README.md
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
## Pré-requis
|
||||||
|
|
||||||
|
- Récupérer le binaire TailwindCSS : https://tailwindcss.com/blog/standalone-cli
|
||||||
|
|
||||||
|
## Exécution
|
||||||
|
|
||||||
|
- Lancer tailwindcss en mode watch dans un terminal :
|
||||||
|
```bash
|
||||||
|
./tailwindcss -i css/input.css -o assets/css/style.css --watch
|
||||||
|
```
|
||||||
|
|
||||||
|
- Lancer le serveur web dans un autre terminal :
|
||||||
|
```bash
|
||||||
|
cargo run --bin app
|
||||||
|
```
|
||||||
|
|
||||||
|
## Rechargement automatique (_auto-reload_)
|
||||||
|
|
||||||
|
Pour le projet `app`, nous utilisons en plus de `cargo-watch` ses librairies :
|
||||||
|
- [`systemfd`](https://github.com/mitsuhiko/systemfd) permet de redémarrer un serveur sans interrompre les connexions en cours, il transmet le descripteur de fichier du socket à une nouvelle instance du serveur (exemple: `cargo watch -x run` --> `systemfd --no-pid -s http::3000 -- cargo watch -x run`). Si le port est déjà pris il en prendra un autre.
|
||||||
|
- [`listenfd`](https://github.com/mitsuhiko/listenfd) permet, côté _Rust_, de démarrer un serveur en utilisant des connexions déjà ouvertes.
|
||||||
|
|
||||||
|
Pour notre application voici la commande à lancer :
|
||||||
|
|
||||||
|
```bash
|
||||||
|
systemfd --no-pid -s http::3000 -- cargo watch -x 'run --bin app'
|
||||||
|
```
|
||||||
|
|
||||||
|
## Chargement à chaud (_livereload_)
|
||||||
|
|
||||||
|
Pour que notre navigateur rafraîchisse automatique notre page lorsque le serveur a été recompilé, nous utilisons la librairie [`tower-livereload`](https://github.com/leotaku/tower-livereload).
|
||||||
|
|
||||||
|
A chaque changement, que ça soit sur du code en _Rust_, _HTML_, _CSS_ ou _JS_ alors le navigateur va recharger entièrement la page.
|
||||||
|
|
||||||
|
En Rust, il n'existe pas encore d'outil de _Hot Reload_ complet et intégré comme on en trouve dans d'autres environnements de développement web, comme pour _Node.js_.
|
||||||
6
crates/app/askama.toml
Normal file
6
crates/app/askama.toml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[general]
|
||||||
|
# Directories to search for templates, relative to the crate root.
|
||||||
|
dirs = [
|
||||||
|
"src/pages",
|
||||||
|
"src/components",
|
||||||
|
]
|
||||||
1203
crates/app/assets/css/style.css
Normal file
1203
crates/app/assets/css/style.css
Normal file
File diff suppressed because it is too large
Load Diff
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
Normal file
5
crates/app/assets/js/alpinejs@3.14.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
Normal file
2
crates/app/assets/js/flowbite@2.5.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
Normal file
1
crates/app/assets/js/htmx@2.0.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
3
crates/app/css/input.css
Normal file
3
crates/app/css/input.css
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
@tailwind base;
|
||||||
|
@tailwind components;
|
||||||
|
@tailwind utilities;
|
||||||
23
crates/app/src/components/base.html
Normal file
23
crates/app/src/components/base.html
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{% if hx_request %}
|
||||||
|
<title>{% block title %}{{ title }}{% endblock %}</title>
|
||||||
|
{% block body %}{% endblock %}
|
||||||
|
{% else %}
|
||||||
|
<!doctype html>
|
||||||
|
<html lang="fr" class="h-full">
|
||||||
|
<head>
|
||||||
|
<title>{% block title %}{{ title }}{% endblock %}</title>
|
||||||
|
|
||||||
|
<script src="/assets/js/htmx@2.0.1.min.js"></script>
|
||||||
|
<script src="/assets/js/alpinejs@3.14.1.min.js" defer></script>
|
||||||
|
<script src="/assets/js/flowbite@2.5.1.min.js"></script>
|
||||||
|
<link href="/assets/css/style.css" rel="stylesheet">
|
||||||
|
|
||||||
|
{% block head %}{% endblock %}
|
||||||
|
</head>
|
||||||
|
<body class="h-full">
|
||||||
|
<div class="min-h-full">
|
||||||
|
{% block body %}{% endblock %}
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
{% endif %}
|
||||||
18
crates/app/src/components/navbar/menu-item.html
Normal file
18
crates/app/src/components/navbar/menu-item.html
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{% set selected = item.id == current %}
|
||||||
|
<li>
|
||||||
|
<a
|
||||||
|
href="{{ item.href }}"
|
||||||
|
{% if selected -%}
|
||||||
|
class="block py-2 px-3 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-blue-500"
|
||||||
|
aria-current="page"
|
||||||
|
{% else -%}
|
||||||
|
class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
|
||||||
|
{% endif -%}
|
||||||
|
hx-get="{{ item.href }}"
|
||||||
|
hx-push-url="true"
|
||||||
|
hx-swap="outerHTML"
|
||||||
|
hx-select-oob="#menu-items,#page-header,#page-main"
|
||||||
|
>
|
||||||
|
{{ item.label }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
50
crates/app/src/components/navbar/navbar.html
Normal file
50
crates/app/src/components/navbar/navbar.html
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
{% macro navbar(current) %}
|
||||||
|
|
||||||
|
{% let items=crate::menu::get_menu_items() %}
|
||||||
|
|
||||||
|
<nav class="bg-white border-gray-200 dark:bg-gray-900">
|
||||||
|
<div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
|
||||||
|
<a href="/" class="flex items-center space-x-3 rtl:space-x-reverse">
|
||||||
|
<img src="https://flowbite.com/docs/images/logo.svg" class="h-8" alt="Flowbite Logo" />
|
||||||
|
<span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">Krys4lide</span>
|
||||||
|
</a>
|
||||||
|
<div class="flex items-center md:order-2 space-x-3 md:space-x-0 rtl:space-x-reverse">
|
||||||
|
<button type="button" class="flex text-sm bg-gray-800 rounded-full md:me-0 focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600" id="user-menu-button" aria-expanded="false" data-dropdown-toggle="user-dropdown" data-dropdown-placement="bottom">
|
||||||
|
<span class="sr-only">Ouvrir le menu de profil</span>
|
||||||
|
<img class="w-8 h-8 rounded-full" src="https://flowbite.com/docs/images/people/profile-picture-3.jpg" alt="user photo">
|
||||||
|
</button>
|
||||||
|
<!-- Dropdown menu -->
|
||||||
|
<div class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-gray-100 rounded-lg shadow dark:bg-gray-700 dark:divide-gray-600" id="user-dropdown">
|
||||||
|
<div class="px-4 py-3">
|
||||||
|
<span class="block text-sm text-gray-900 dark:text-white">Bonnie Green</span>
|
||||||
|
<span class="block text-sm text-gray-500 truncate dark:text-gray-400">name@flowbite.com</span>
|
||||||
|
</div>
|
||||||
|
<ul class="py-2" aria-labelledby="user-menu-button">
|
||||||
|
<li>
|
||||||
|
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Profile</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Settings</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Sign out</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<button data-collapse-toggle="navbar-user" type="button" class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-500 rounded-lg md:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600" aria-controls="navbar-user" aria-expanded="false">
|
||||||
|
<span class="sr-only">Ouvrir le menu de navigation</span>
|
||||||
|
<svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 17 14">
|
||||||
|
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="items-center justify-between hidden w-full md:flex md:w-auto md:order-1" id="navbar-user">
|
||||||
|
<ul id="menu-items" class="flex flex-col font-medium p-4 md:p-0 mt-4 border border-gray-100 rounded-lg bg-gray-50 md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700">
|
||||||
|
{% for item in items %}
|
||||||
|
{% include "navbar/menu-item.html" %}
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
{% endmacro %}
|
||||||
22
crates/app/src/components/skeletons/card.html
Normal file
22
crates/app/src/components/skeletons/card.html
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
<div role="status" class="animate-pulse max-w-sm p-4 border border-gray-200 rounded shadow md:p-6 dark:border-gray-700">
|
||||||
|
<div class="flex items-center justify-center h-48 mb-4 bg-gray-300 rounded dark:bg-gray-700">
|
||||||
|
<svg class="w-10 h-10 text-gray-200 dark:text-gray-600" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 16 20">
|
||||||
|
<path d="M14.066 0H7v5a2 2 0 0 1-2 2H0v11a1.97 1.97 0 0 0 1.934 2h12.132A1.97 1.97 0 0 0 16 18V2a1.97 1.97 0 0 0-1.934-2ZM10.5 6a1.5 1.5 0 1 1 0 2.999A1.5 1.5 0 0 1 10.5 6Zm2.221 10.515a1 1 0 0 1-.858.485h-8a1 1 0 0 1-.9-1.43L5.6 10.039a.978.978 0 0 1 .936-.57 1 1 0 0 1 .9.632l1.181 2.981.541-1a.945.945 0 0 1 .883-.522 1 1 0 0 1 .879.529l1.832 3.438a1 1 0 0 1-.031.988Z"/>
|
||||||
|
<path d="M5 5V.13a2.96 2.96 0 0 0-1.293.749L.879 3.707A2.98 2.98 0 0 0 .13 5H5Z"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
|
||||||
|
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
||||||
|
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
|
||||||
|
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
||||||
|
<div class="flex items-center mt-4">
|
||||||
|
<svg class="w-10 h-10 me-3 text-gray-200 dark:text-gray-700" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
|
||||||
|
<path d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z"/>
|
||||||
|
</svg>
|
||||||
|
<div>
|
||||||
|
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-32 mb-2"></div>
|
||||||
|
<div class="w-48 h-2 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span class="sr-only">Loading...</span>
|
||||||
|
</div>
|
||||||
4
crates/app/src/components/skeletons/menu-items.html
Normal file
4
crates/app/src/components/skeletons/menu-items.html
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<div role="status" class="animate-pulse flex items-center justify-center h-full">
|
||||||
|
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700 me-3"></div>
|
||||||
|
<div class="w-32 h-4 bg-gray-200 rounded-full dark:bg-gray-700"></div>
|
||||||
|
</div>
|
||||||
1
crates/app/src/components/skeletons/page-title.html
Normal file
1
crates/app/src/components/skeletons/page-title.html
Normal file
@ -0,0 +1 @@
|
|||||||
|
<div role="status" class="animate-pulse h-7 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mt-3"></div>
|
||||||
21
crates/app/src/lib.rs
Normal file
21
crates/app/src/lib.rs
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
use axum::http::{StatusCode, Uri};
|
||||||
|
use axum_htmx::AutoVaryLayer;
|
||||||
|
use tower_http::services::ServeDir;
|
||||||
|
|
||||||
|
mod menu;
|
||||||
|
mod pages;
|
||||||
|
|
||||||
|
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
||||||
|
(StatusCode::NOT_FOUND, format!("No route for {uri}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_router(assets_path: PathBuf) -> axum::Router<()> {
|
||||||
|
axum::Router::new()
|
||||||
|
.nest_service("/assets", ServeDir::new(assets_path))
|
||||||
|
.merge(pages::get_routes())
|
||||||
|
.fallback(fallback)
|
||||||
|
// The AutoVaryLayer is used to avoid cache issues with htmx (cf: https://github.com/robertwayne/axum-htmx?tab=readme-ov-file#auto-caching-management)
|
||||||
|
.layer(AutoVaryLayer)
|
||||||
|
}
|
||||||
84
crates/app/src/main.rs
Normal file
84
crates/app/src/main.rs
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::{env, io};
|
||||||
|
|
||||||
|
use axum::body::Body;
|
||||||
|
use axum::http::Request;
|
||||||
|
use listenfd::ListenFd;
|
||||||
|
use notify::Watcher;
|
||||||
|
use thiserror::Error;
|
||||||
|
use tokio::net::TcpListener;
|
||||||
|
use tower_livereload::predicate::Predicate;
|
||||||
|
use tower_livereload::LiveReloadLayer;
|
||||||
|
|
||||||
|
use ::app::get_router;
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub enum AppError {
|
||||||
|
#[error("Unable to bind to TCP listener")]
|
||||||
|
TCPListener(#[from] std::io::Error),
|
||||||
|
#[error("Error with the notify watcher")]
|
||||||
|
NotifyWatcher(#[from] notify::Error),
|
||||||
|
#[error("Missing environment variable {var}")]
|
||||||
|
MissingEnvVar { var: &'static str },
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Nous filtrons les requêtes de `htmx` pour ne pas inclure le script _JS_ qui gère le rechargement
|
||||||
|
/// Voir https://github.com/leotaku/tower-livereload/pull/3
|
||||||
|
#[derive(Copy, Clone)]
|
||||||
|
struct NotHtmxPredicate;
|
||||||
|
impl<T> Predicate<Request<T>> for NotHtmxPredicate {
|
||||||
|
fn check(&mut self, req: &Request<T>) -> bool {
|
||||||
|
!(req.headers().contains_key("hx-request"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const DEFAULT_LISTENER: &str = "localhost:3000";
|
||||||
|
async fn get_tcp_listener() -> Result<TcpListener, io::Error> {
|
||||||
|
let mut listenfd = ListenFd::from_env();
|
||||||
|
|
||||||
|
match listenfd.take_tcp_listener(0)? {
|
||||||
|
// if we are given a tcp listener on listen fd 0, we use that one
|
||||||
|
Some(listener) => {
|
||||||
|
listener.set_nonblocking(true)?;
|
||||||
|
Ok(TcpListener::from_std(listener)?)
|
||||||
|
}
|
||||||
|
// otherwise fall back to local listening
|
||||||
|
None => Ok(TcpListener::bind(DEFAULT_LISTENER).await?),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_livereload_layer(
|
||||||
|
templates_paths: Vec<PathBuf>,
|
||||||
|
) -> Result<LiveReloadLayer<NotHtmxPredicate>, notify::Error> {
|
||||||
|
let livereload = LiveReloadLayer::new();
|
||||||
|
let reloader = livereload.reloader();
|
||||||
|
let mut watcher = notify::recommended_watcher(move |_| reloader.reload())?;
|
||||||
|
for templates_path in templates_paths {
|
||||||
|
watcher.watch(templates_path.as_path(), notify::RecursiveMode::Recursive)?;
|
||||||
|
}
|
||||||
|
Ok(livereload.request_predicate::<Body, NotHtmxPredicate>(NotHtmxPredicate))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> Result<(), AppError> {
|
||||||
|
let manifest_dir = env::var("CARGO_MANIFEST_DIR").map_err(|_| AppError::MissingEnvVar {
|
||||||
|
var: "CARGO_MANIFEST_DIR",
|
||||||
|
})?;
|
||||||
|
let assets_path = Path::new(&manifest_dir).join("assets");
|
||||||
|
let templates_paths = vec![
|
||||||
|
Path::new(&manifest_dir).join("src/pages"),
|
||||||
|
Path::new(&manifest_dir).join("src/components"),
|
||||||
|
];
|
||||||
|
|
||||||
|
let livereload_layer =
|
||||||
|
get_livereload_layer(templates_paths).map_err(AppError::NotifyWatcher)?;
|
||||||
|
let router = get_router(assets_path).await.layer(livereload_layer);
|
||||||
|
|
||||||
|
let listener: TcpListener = get_tcp_listener().await.map_err(AppError::TCPListener)?;
|
||||||
|
let local_addr = listener.local_addr().map_err(AppError::TCPListener)?;
|
||||||
|
println!("Listening on: http://{}", local_addr);
|
||||||
|
|
||||||
|
// Run the server with the router
|
||||||
|
axum::serve(listener, router.into_make_service()).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
23
crates/app/src/menu.rs
Normal file
23
crates/app/src/menu.rs
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
pub struct MenuItem {
|
||||||
|
pub id: String,
|
||||||
|
pub label: String,
|
||||||
|
pub href: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the menu items
|
||||||
|
/// This function is the central place to define the menu items
|
||||||
|
/// It can be used directly in templates, for example in the `navbar` component to render the menu
|
||||||
|
pub fn get_menu_items() -> Vec<MenuItem> {
|
||||||
|
vec![
|
||||||
|
MenuItem {
|
||||||
|
id: "home".to_string(),
|
||||||
|
label: "Accueil".to_string(),
|
||||||
|
href: "/".to_string(),
|
||||||
|
},
|
||||||
|
MenuItem {
|
||||||
|
id: "cps".to_string(),
|
||||||
|
label: "CPS".to_string(),
|
||||||
|
href: "/cps".to_string(),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
43
crates/app/src/pages/cps.html
Normal file
43
crates/app/src/pages/cps.html
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
{% import "navbar/navbar.html" as navbar -%}
|
||||||
|
|
||||||
|
{% block title %}Pharma Libre - CPS{% endblock %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
{% call navbar::navbar(current="cps") %}
|
||||||
|
<div class="py-10">
|
||||||
|
<header id="page-header">
|
||||||
|
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
|
||||||
|
<h1
|
||||||
|
id="page-title"
|
||||||
|
class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
|
||||||
|
>
|
||||||
|
CPS
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
<main id="page-main">
|
||||||
|
<div
|
||||||
|
class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
||||||
|
>A</div>
|
||||||
|
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>B</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>C</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>D</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>E</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
12
crates/app/src/pages/cps.rs
Normal file
12
crates/app/src/pages/cps.rs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
use askama_axum::Template;
|
||||||
|
use axum_htmx::HxRequest;
|
||||||
|
|
||||||
|
#[derive(Template)]
|
||||||
|
#[template(path = "cps.html")]
|
||||||
|
pub struct CpsTemplate {
|
||||||
|
hx_request: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn cps(HxRequest(hx_request): HxRequest) -> CpsTemplate {
|
||||||
|
CpsTemplate { hx_request }
|
||||||
|
}
|
||||||
43
crates/app/src/pages/home.html
Normal file
43
crates/app/src/pages/home.html
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
{% import "navbar/navbar.html" as navbar -%}
|
||||||
|
|
||||||
|
{% block title %}Pharma Libre - Accueil{% endblock %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
{% call navbar::navbar(current="home") %}
|
||||||
|
<div class="py-10">
|
||||||
|
<header id="page-header">
|
||||||
|
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
|
||||||
|
<h1
|
||||||
|
id="page-title"
|
||||||
|
class="text-3xl font-bold leading-tight tracking-tight text-gray-900"
|
||||||
|
>
|
||||||
|
Accueil
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
<main id="page-main">
|
||||||
|
<div
|
||||||
|
class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8"
|
||||||
|
>
|
||||||
|
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed border-gray-300 rounded-lg dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>A</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>B</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>C</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-32 md:h-64"
|
||||||
|
>D</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="border-2 border-dashed rounded-lg border-gray-300 dark:border-gray-600 h-96 mb-4"
|
||||||
|
>E</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
12
crates/app/src/pages/home.rs
Normal file
12
crates/app/src/pages/home.rs
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
use askama_axum::Template;
|
||||||
|
use axum_htmx::HxRequest;
|
||||||
|
|
||||||
|
#[derive(Template)]
|
||||||
|
#[template(path = "home.html")]
|
||||||
|
pub struct GetHomeTemplate {
|
||||||
|
hx_request: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn home(HxRequest(hx_request): HxRequest) -> GetHomeTemplate {
|
||||||
|
GetHomeTemplate { hx_request }
|
||||||
|
}
|
||||||
10
crates/app/src/pages/mod.rs
Normal file
10
crates/app/src/pages/mod.rs
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
use axum::{routing, Router};
|
||||||
|
|
||||||
|
mod cps;
|
||||||
|
mod home;
|
||||||
|
|
||||||
|
pub fn get_routes() -> Router {
|
||||||
|
Router::new()
|
||||||
|
.route("/", routing::get(home::home))
|
||||||
|
.route("/cps", routing::get(cps::cps))
|
||||||
|
}
|
||||||
12
crates/app/tailwind.config.js
Normal file
12
crates/app/tailwind.config.js
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
/** @type {import('tailwindcss').Config} */
|
||||||
|
module.exports = {
|
||||||
|
content: [
|
||||||
|
'./src/**/*.html',
|
||||||
|
'./css/**/*.css',
|
||||||
|
],
|
||||||
|
theme: {
|
||||||
|
extend: {},
|
||||||
|
},
|
||||||
|
plugins: [],
|
||||||
|
}
|
||||||
|
|
||||||
@ -5,25 +5,10 @@ edition = "2021"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0.89"
|
anyhow = "1.0.89"
|
||||||
axum = { version = "0.7.6", features = ["macros"] }
|
axum = "0.7.6"
|
||||||
listenfd = "1.0.1"
|
listenfd = "1.0.1"
|
||||||
tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
|
tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
|
||||||
tower-http = { version = "0.6.1", features = ["cors"] }
|
|
||||||
|
|
||||||
sea-orm = { workspace = true, features = [
|
|
||||||
# Same `ASYNC_RUNTIME` and `DATABASE_DRIVER` as in the migration crate
|
|
||||||
"sqlx-sqlite",
|
|
||||||
"runtime-tokio-rustls",
|
|
||||||
"macros",
|
|
||||||
] }
|
|
||||||
serde.workspace = true
|
|
||||||
thiserror.workspace = true
|
|
||||||
|
|
||||||
entity = { path = "../../entity" }
|
|
||||||
migration = { path = "../../migration" }
|
|
||||||
utils = { path = "../utils" }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
cargo-watch = "8.5.2"
|
cargo-watch = "8.5.2"
|
||||||
sea-orm-cli.workspace = true
|
|
||||||
systemfd = "0.4.3"
|
systemfd = "0.4.3"
|
||||||
|
|||||||
@ -10,19 +10,10 @@ En développement, le mécanisme de hot-reload nécessite de disposer de `cargo-
|
|||||||
cargo install cargo-watch systemfd
|
cargo install cargo-watch systemfd
|
||||||
```
|
```
|
||||||
|
|
||||||
## Configuration
|
|
||||||
|
|
||||||
> Astuce : lorsqu'on exécute directement la crate `backend` à des fins de développement, le système de configuration n'utilisera pas l'éventuel fichier `.env` situé à la racine du workspace Rust. Pour éviter de dupliquer le fichier `.env`, il est possible de créer un lien symbolique vers le fichier `.env` de la crate `backend` :
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd crates/backend
|
|
||||||
ln -s ../../.env .env
|
|
||||||
```
|
|
||||||
|
|
||||||
## Développement
|
## Développement
|
||||||
|
|
||||||
Pour lancer le serveur en mode développement, exécutez la commande suivante :
|
Pour lancer le serveur en mode développement, exécutez la commande suivante :
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
systemfd --no-pid -s http::8080 -- cargo watch -w crates/backend -x 'run --bin backend'
|
systemfd --no-pid -s http::3030 -- cargo watch -x 'run --bin backend'
|
||||||
```
|
```
|
||||||
|
|||||||
@ -1,48 +0,0 @@
|
|||||||
use axum::{extract::State, routing, Json};
|
|
||||||
use sea_orm::*;
|
|
||||||
use serde::Serialize;
|
|
||||||
|
|
||||||
use ::entity::{debug, debug::Entity as DebugEntity};
|
|
||||||
|
|
||||||
use crate::{AppError, AppState};
|
|
||||||
|
|
||||||
// DATABASE DEBUG CONTROLLERS
|
|
||||||
|
|
||||||
async fn get_debug_entries(db: &DatabaseConnection) -> Result<Vec<debug::Model>, DbErr> {
|
|
||||||
DebugEntity::find().all(db).await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn add_random_debug_entry(State(AppState { db_connection }): State<AppState>) {
|
|
||||||
let random_entry = debug::ActiveModel {
|
|
||||||
title: Set("Random title".to_string()),
|
|
||||||
text: Set("Random text".to_string()),
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
random_entry.insert(&db_connection).await.unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
// API HANDLER
|
|
||||||
|
|
||||||
#[derive(Serialize, Debug)]
|
|
||||||
struct DebugResponse {
|
|
||||||
db_ping_status: bool,
|
|
||||||
entries: Vec<debug::Model>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[axum::debug_handler]
|
|
||||||
async fn debug(
|
|
||||||
State(AppState { db_connection }): State<AppState>,
|
|
||||||
) -> Result<Json<DebugResponse>, AppError> {
|
|
||||||
let db_ping_status = db_connection.ping().await.is_ok();
|
|
||||||
let debug_entries = get_debug_entries(&db_connection).await?;
|
|
||||||
Ok(Json(DebugResponse {
|
|
||||||
db_ping_status,
|
|
||||||
entries: debug_entries,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_routes() -> axum::Router<crate::AppState> {
|
|
||||||
axum::Router::new()
|
|
||||||
.route("/", routing::get(debug))
|
|
||||||
.route("/add_random", routing::post(add_random_debug_entry))
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
use axum::Router;
|
|
||||||
|
|
||||||
use crate::AppState;
|
|
||||||
|
|
||||||
mod debug;
|
|
||||||
|
|
||||||
pub fn get_routes() -> Router<AppState> {
|
|
||||||
Router::new().nest("/debug", debug::get_routes())
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
use migration::{Migrator, MigratorTrait};
|
|
||||||
use sea_orm::{Database, DatabaseConnection, DbErr};
|
|
||||||
use std::env;
|
|
||||||
|
|
||||||
pub async fn get_connection() -> Result<DatabaseConnection, DbErr> {
|
|
||||||
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
|
||||||
|
|
||||||
let db_connection = Database::connect(database_url).await?;
|
|
||||||
Migrator::up(&db_connection, None).await?;
|
|
||||||
Ok(db_connection)
|
|
||||||
}
|
|
||||||
@ -1,47 +1,12 @@
|
|||||||
use anyhow::Error as AnyError;
|
use anyhow::Error as AnyError;
|
||||||
use axum::http::{header, StatusCode, Uri};
|
use axum::http::{StatusCode, Uri};
|
||||||
use axum::response::{IntoResponse, Response};
|
use axum::response::{IntoResponse, Response};
|
||||||
use axum::{routing::get, Router};
|
use axum::{routing::get, Router};
|
||||||
use sea_orm::{DatabaseConnection, DbErr};
|
|
||||||
use thiserror::Error;
|
|
||||||
use tower_http::cors::{Any, CorsLayer};
|
|
||||||
|
|
||||||
use ::utils::config::{load_config, ConfigError};
|
pub fn get_router() -> Router {
|
||||||
|
Router::new()
|
||||||
mod api;
|
|
||||||
mod db;
|
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
|
||||||
pub enum InitError {
|
|
||||||
#[error(transparent)]
|
|
||||||
ConfigError(#[from] ConfigError),
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn init() -> Result<(), InitError> {
|
|
||||||
load_config(None)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct AppState {
|
|
||||||
db_connection: DatabaseConnection,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_router() -> Result<Router, DbErr> {
|
|
||||||
let db_connection = db::get_connection().await?;
|
|
||||||
let state: AppState = AppState { db_connection };
|
|
||||||
|
|
||||||
let cors = CorsLayer::new()
|
|
||||||
.allow_methods(Any)
|
|
||||||
.allow_origin(Any)
|
|
||||||
.allow_headers([header::CONTENT_TYPE]);
|
|
||||||
|
|
||||||
Ok(Router::new()
|
|
||||||
.route("/", get(|| async { "Hello, world!" }))
|
.route("/", get(|| async { "Hello, world!" }))
|
||||||
.merge(api::get_routes())
|
|
||||||
.fallback(fallback)
|
.fallback(fallback)
|
||||||
.with_state(state)
|
|
||||||
.layer(cors))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
async fn fallback(uri: Uri) -> (StatusCode, String) {
|
||||||
|
|||||||
@ -1,39 +1,24 @@
|
|||||||
use listenfd::ListenFd;
|
use listenfd::ListenFd;
|
||||||
use thiserror::Error;
|
|
||||||
use tokio::net::TcpListener;
|
use tokio::net::TcpListener;
|
||||||
|
|
||||||
use backend::{get_router, init, InitError};
|
use backend::get_router;
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
|
||||||
pub enum BackendError {
|
|
||||||
#[error("Error while setting up or serving the TCP listener")]
|
|
||||||
ServeTCPListener(#[from] std::io::Error),
|
|
||||||
#[error("Error while initialising the backend")]
|
|
||||||
InitError(#[from] InitError),
|
|
||||||
#[error("Error with the database connection")]
|
|
||||||
DatabaseConnection(#[from] sea_orm::DbErr),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<(), BackendError> {
|
async fn main() {
|
||||||
init()?;
|
let app = get_router();
|
||||||
|
|
||||||
let app = get_router().await?;
|
|
||||||
|
|
||||||
let mut listenfd = ListenFd::from_env();
|
let mut listenfd = ListenFd::from_env();
|
||||||
let listener = match listenfd.take_tcp_listener(0)? {
|
|
||||||
|
let listener = match listenfd.take_tcp_listener(0).unwrap() {
|
||||||
// if we are given a tcp listener on listen fd 0, we use that one
|
// if we are given a tcp listener on listen fd 0, we use that one
|
||||||
Some(listener) => {
|
Some(listener) => {
|
||||||
listener.set_nonblocking(true)?;
|
listener.set_nonblocking(true).unwrap();
|
||||||
TcpListener::from_std(listener)?
|
TcpListener::from_std(listener).unwrap()
|
||||||
}
|
}
|
||||||
// otherwise fall back to local listening
|
// otherwise fall back to local listening
|
||||||
None => TcpListener::bind("0.0.0.0:8080").await?,
|
None => TcpListener::bind("0.0.0.0:8080").await.unwrap(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let local_addr = listener.local_addr()?;
|
println!("Listening on {}", listener.local_addr().unwrap());
|
||||||
println!("Listening on http://{}", local_addr);
|
axum::serve(listener, app).await.unwrap();
|
||||||
axum::serve(listener, app).await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,12 +13,8 @@ crate-type = ["lib", "cdylib", "staticlib"]
|
|||||||
tauri-build = { version = "2.0.0-rc", features = [] }
|
tauri-build = { version = "2.0.0-rc", features = [] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bytes = "1.6.1"
|
|
||||||
http = "1.1.0"
|
|
||||||
serde = { version = "1", features = ["derive"] }
|
|
||||||
serde_json = "1"
|
|
||||||
tauri = { version = "2.0.0-rc", features = [] }
|
tauri = { version = "2.0.0-rc", features = [] }
|
||||||
tauri-plugin-shell = "2.0.0-rc"
|
tauri-plugin-shell = "2.0.0-rc"
|
||||||
tower = "0.4.13"
|
serde = { version = "1", features = ["derive"] }
|
||||||
|
serde_json = "1"
|
||||||
|
|
||||||
thiserror.workspace = true
|
|
||||||
|
|||||||
@ -1,18 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "fsv-sys"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
links = "ssvlux64,ssvosx,Ssvw64"
|
|
||||||
# Linux: Libssvlux64.so
|
|
||||||
# Windows: Ssvw64.dll
|
|
||||||
# macOS: ssvosx.framework
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
libc = "0.2.159"
|
|
||||||
libloading = "0.8.5"
|
|
||||||
|
|
||||||
thiserror.workspace = true
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
bindgen = "0.70.1"
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
# État d'avancement de l'implémentation des bindings FSV
|
|
||||||
|
|
||||||
| Module | Progression |
|
|
||||||
|-------------|------------------------------------|
|
|
||||||
| [SSV](#ssv) |  |
|
|
||||||
| [SGD](#sgd) |  |
|
|
||||||
| [SRT](#srt) |  |
|
|
||||||
| [STS](#sts) |  |
|
|
||||||
|
|
||||||
## SSV
|
|
||||||
|
|
||||||
| Fonctions implémentées |
|
|
||||||
|------------------------|
|
|
||||||
| SSV_InitLIB2 |
|
|
||||||
| SSV_LireConfig |
|
|
||||||
| SSV_LireCartePS |
|
|
||||||
|
|
||||||
## SGD
|
|
||||||
|
|
||||||
| Fonctions implémentées |
|
|
||||||
|------------------------|
|
|
||||||
|
|
||||||
|
|
||||||
## SRT
|
|
||||||
|
|
||||||
| Fonctions implémentées |
|
|
||||||
|------------------------|
|
|
||||||
|
|
||||||
## STS
|
|
||||||
|
|
||||||
| Fonctions implémentées |
|
|
||||||
|------------------------|
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
# FSV-sys, bindings Rust pour le package FSV SESAM-Vitale
|
|
||||||
|
|
||||||
## Librairies FSV
|
|
||||||
|
|
||||||
### Versions supportées
|
|
||||||
|
|
||||||
| Version FSV |
|
|
||||||
|-------------|
|
|
||||||
| 1.40.14 |
|
|
||||||
| 1.40.13 |
|
|
||||||
|
|
||||||
### État d'avancement de l'implémentation des bindings FSV
|
|
||||||
|
|
||||||
Les détails de l'avancement de l'implémentation des bindings FSV sont donnés dans le fichier [PROGRESS.md](PROGRESS.md)
|
|
||||||
|
|
||||||
## Utilisation
|
|
||||||
|
|
||||||
### Pré-requis
|
|
||||||
|
|
||||||
- Installer le [package FSV](https://industriels.sesam-vitale.fr/group/fournitures-sesam-vitale)
|
|
||||||
- Les librairies dynamiques (.lib, .dll, ...) fournies ne sont pas installés dans les emplacements standard du système, il faudra donc configurer leur chemin d'installation dans le fichier de configuration `.env.build` (voir ci-dessous)
|
|
||||||
- Le détail des chemins d'installation est donné dans la documentation du package FSV `fsv-mi-004_pack-FSV1.40.14_V2.3.pdf`
|
|
||||||
- Linux - par défaut : `/opt/santesocial/fsv/1.40.13/lib`
|
|
||||||
- Windows - par défaut : `C:\Program Files\santesocial\santesocial\fsv\1.40.14\lib` (ou dans Program Files (x86) si c'est le package 32bits qui a été installé)
|
|
||||||
|
|
||||||
- Installer la [CryptolibCPS](https://industriels.sesam-vitale.fr/group/galss-cryptolib-cps)
|
|
||||||
- Ce package fourni également l'utilitaire "CPS Gestion" pour obtenir des informations sur le lecteur de carte, etc.
|
|
||||||
- Linux : `cpgeslux`
|
|
||||||
- Windows : `...`
|
|
||||||
|
|
||||||
## Développement
|
|
||||||
|
|
||||||
### Pré-requis
|
|
||||||
|
|
||||||
- Pour la génération des bindings lors de la phase de `build` à l'aide de `bindgen`, il est nécessaire d'avoir installé `clang` ([documentation](https://rust-lang.github.io/rust-bindgen/requirements.html)).
|
|
||||||
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
#ifndef WRAPPER_LINUX_H
|
|
||||||
#define WRAPPER_LINUX_H
|
|
||||||
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/linux/mc_sys_def.h"
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.13/ssv.h"
|
|
||||||
|
|
||||||
#endif // WRAPPER_LINUX_H
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
#ifndef WRAPPER_MACOSX_H
|
|
||||||
#define WRAPPER_MACOSX_H
|
|
||||||
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/macosx/mc_sys_def.h"
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.13/ssv.h"
|
|
||||||
|
|
||||||
#endif // WRAPPER_MACOSX_H
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
#ifndef WRAPPER_WIN_H
|
|
||||||
#define WRAPPER_WIN_H
|
|
||||||
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/win/mc_sys_def.h"
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.13/ssv.h"
|
|
||||||
|
|
||||||
#endif // WRAPPER_WIN_H
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
#ifndef WRAPPER_LINUX_H
|
|
||||||
#define WRAPPER_LINUX_H
|
|
||||||
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/linux/mc_sys_def.h"
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.14/ssv.h"
|
|
||||||
|
|
||||||
#endif // WRAPPER_LINUX_H
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
#ifndef WRAPPER_MACOSX_H
|
|
||||||
#define WRAPPER_MACOSX_H
|
|
||||||
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/macosx/mc_sys_def.h"
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.14/ssv.h"
|
|
||||||
|
|
||||||
#endif // WRAPPER_MACOSX_H
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
#ifndef WRAPPER_WIN_H
|
|
||||||
#define WRAPPER_WIN_H
|
|
||||||
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SYS_DEF/win/mc_sys_def.h"
|
|
||||||
#include "../../vendor/fsv/1.40.14.13/includes/SSV/pourFSV1.40.14/ssv.h"
|
|
||||||
|
|
||||||
#endif // WRAPPER_WIN_H
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
use std::{env, path::PathBuf};
|
|
||||||
|
|
||||||
// Supported versions of FSV
|
|
||||||
static SUPPORTED_FSV_VERSIONS: [&str; 2] = ["1.40.14", "1.40.13"];
|
|
||||||
|
|
||||||
fn build_bindings(version: &str, target_code: &str) -> PathBuf {
|
|
||||||
let target = env::var("TARGET").expect("TARGET not set");
|
|
||||||
let wrapper_path = format!("bindgen-wrappers/{}/wrapper.{}.h", version, target_code);
|
|
||||||
let bindings = bindgen::Builder::default()
|
|
||||||
// The input header we would like to generate
|
|
||||||
// bindings for.
|
|
||||||
.header(wrapper_path)
|
|
||||||
// To generate the bindings for specific target
|
|
||||||
.clang_arg(format!("--target={}", target))
|
|
||||||
// Limit the bindings generation to the SSV_ prefix
|
|
||||||
.allowlist_item("SSV_.*")
|
|
||||||
// Tell cargo to invalidate the built crate whenever any of the
|
|
||||||
// included header files changed.
|
|
||||||
.parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
|
|
||||||
// Finish the builder and generate the bindings.
|
|
||||||
.generate()
|
|
||||||
// Unwrap the Result and panic on failure.
|
|
||||||
.expect("Unable to generate bindings");
|
|
||||||
|
|
||||||
// Write the bindings to the $OUT_DIR/bindings.rs file.
|
|
||||||
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
|
|
||||||
let out_file = format!("bindings_{}.rs", version);
|
|
||||||
let out_path = out_dir.join(out_file);
|
|
||||||
bindings
|
|
||||||
.write_to_file(&out_path)
|
|
||||||
.expect("Couldn't write bindings! ");
|
|
||||||
out_path
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_target_code() -> String {
|
|
||||||
// Use CARGO configuration env Variable, because !cfg(target_os) is not available in build.rs
|
|
||||||
// Source: https://kazlauskas.me/entries/writing-proper-buildrs-scripts
|
|
||||||
let target_os = env::var("CARGO_CFG_TARGET_OS");
|
|
||||||
|
|
||||||
match target_os.as_ref().map(|x| &**x) {
|
|
||||||
Ok("linux") => "linux", // lib_name = "ssvlux64";
|
|
||||||
Ok("windows") => "win", // lib_name = "Ssvw64";
|
|
||||||
Ok("macos") => "macosx", // lib_name = "ssvosx";
|
|
||||||
tos => panic!("Unsupported target_os {:?}", tos),
|
|
||||||
}
|
|
||||||
.to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
let target_code = get_target_code();
|
|
||||||
// Build the bindings for each supported version of FSV
|
|
||||||
let bindings_paths: Vec<PathBuf> = SUPPORTED_FSV_VERSIONS
|
|
||||||
.iter()
|
|
||||||
.map(|version| build_bindings(version, &target_code))
|
|
||||||
.collect();
|
|
||||||
println!("FSV bindings generated: {:#?}", bindings_paths);
|
|
||||||
}
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
#![allow(non_upper_case_globals)]
|
|
||||||
#![allow(non_camel_case_types)]
|
|
||||||
#![allow(non_snake_case)]
|
|
||||||
#![allow(unused)]
|
|
||||||
|
|
||||||
pub mod BINDINGS_V1_40_14 {
|
|
||||||
include!(concat!(env!("OUT_DIR"), "/bindings_1.40.14.rs"));
|
|
||||||
}
|
|
||||||
|
|
||||||
pub mod BINDINGS_V1_40_13 {
|
|
||||||
include!(concat!(env!("OUT_DIR"), "/bindings_1.40.13.rs"));
|
|
||||||
}
|
|
||||||
@ -1,212 +0,0 @@
|
|||||||
#![allow(non_snake_case)]
|
|
||||||
|
|
||||||
use std::marker::PhantomData;
|
|
||||||
|
|
||||||
mod bindings;
|
|
||||||
use bindings::*;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub enum SupportedFsvVersion {
|
|
||||||
V1_40_14, // 1.40.14
|
|
||||||
V1_40_13, // 1.40.13
|
|
||||||
}
|
|
||||||
|
|
||||||
impl SupportedFsvVersion {
|
|
||||||
fn as_str(&self) -> &'static str {
|
|
||||||
match self {
|
|
||||||
Self::V1_40_14 => "1.40.14",
|
|
||||||
Self::V1_40_13 => "1.40.13",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(thiserror::Error, Debug)]
|
|
||||||
pub enum Error {
|
|
||||||
#[error(transparent)]
|
|
||||||
LibLoading(#[from] libloading::Error),
|
|
||||||
#[error("Symbol missing: {0}")]
|
|
||||||
SymbolMissing(&'static str),
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Macro to generate a function that implements a call to an external function in BINDINGS
|
|
||||||
macro_rules! ssv_function {
|
|
||||||
($binding:ty, $func_name:ident, {$($arg_name:ident: $arg_type:ty),*}) => {
|
|
||||||
/// # Safety
|
|
||||||
/// This function is unsafe because it calls an external function through FFI.
|
|
||||||
/// The caller must ensure that the provided arguments are valid and that the
|
|
||||||
/// external function is safe to call.
|
|
||||||
pub unsafe fn $func_name(&self, $($arg_name: $arg_type),*) -> Result<u16, Error> {
|
|
||||||
let symbol_name = match stringify!($binding)
|
|
||||||
.split(&[' ', ':'])
|
|
||||||
.last() {
|
|
||||||
Some(name) => name,
|
|
||||||
None => return Err(Error::SymbolMissing(stringify!($binding))),
|
|
||||||
};
|
|
||||||
let func_struct: libloading::Symbol<'_, $binding> =
|
|
||||||
unsafe { self.library.get(symbol_name.as_bytes())? };
|
|
||||||
let func = match *func_struct {
|
|
||||||
Some(func) => func,
|
|
||||||
None => return Err(Error::SymbolMissing(stringify!($binding))),
|
|
||||||
};
|
|
||||||
Ok(func($($arg_name),*))
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// `sealed::Sealed` trait is used to prevent external crates from implementing the LibVersion trait.
|
|
||||||
mod sealed { pub trait Sealed {}}
|
|
||||||
|
|
||||||
/// Wrapper around the SESAM-VITALE library
|
|
||||||
/// This struct is responsible for loading the library and providing an interface to call its functions.
|
|
||||||
/// The library is loaded at creation and kept in memory until the struct is dropped.
|
|
||||||
pub trait SSVLibraryCommon {
|
|
||||||
fn new(path: &str) -> Result<Self, Error> where Self: Sized;
|
|
||||||
}
|
|
||||||
|
|
||||||
pub trait SSVLibraryVersion: sealed::Sealed {}
|
|
||||||
|
|
||||||
pub struct V1_40_13 {}
|
|
||||||
impl sealed::Sealed for V1_40_13 {}
|
|
||||||
impl SSVLibraryVersion for V1_40_13 {}
|
|
||||||
|
|
||||||
pub struct V1_40_14 {}
|
|
||||||
impl sealed::Sealed for V1_40_14 {}
|
|
||||||
impl SSVLibraryVersion for V1_40_14 {}
|
|
||||||
|
|
||||||
pub struct SSVLibrary<Version: SSVLibraryVersion> {
|
|
||||||
_version: PhantomData<Version>,
|
|
||||||
library: libloading::Library,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<Version: SSVLibraryVersion> SSVLibraryCommon for SSVLibrary<Version> {
|
|
||||||
fn new(path: &str) -> Result<Self, Error> {
|
|
||||||
let library = unsafe { libloading::Library::new(path)?};
|
|
||||||
Ok(Self {
|
|
||||||
_version: PhantomData,
|
|
||||||
library
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl SSVLibrary<V1_40_14> {
|
|
||||||
pub fn library(&self) -> &libloading::Library {
|
|
||||||
&self.library
|
|
||||||
}
|
|
||||||
|
|
||||||
ssv_function!(BINDINGS_V1_40_14::SSV_InitLIB2, ssv_init_lib2, {
|
|
||||||
pcFichierSesam: *const i8
|
|
||||||
});
|
|
||||||
|
|
||||||
ssv_function!(BINDINGS_V1_40_14::SSV_LireConfig, ssv_lire_config, {
|
|
||||||
pZDataOut: *mut *mut libc::c_void,
|
|
||||||
psTailleDataOut: *mut usize
|
|
||||||
});
|
|
||||||
|
|
||||||
ssv_function!(BINDINGS_V1_40_14::SSV_LireCartePS, ssv_lire_carte_ps, {
|
|
||||||
NomRessourcePS: *const i8,
|
|
||||||
NomRessourceLecteur: *const i8,
|
|
||||||
CodePorteurPS: *const i8,
|
|
||||||
pZDataOut: *mut *mut libc::c_void,
|
|
||||||
pTailleZone: *mut usize
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
impl SSVLibrary<V1_40_13> {
|
|
||||||
ssv_function!(BINDINGS_V1_40_13::SSV_InitLIB2, ssv_init_lib2, {
|
|
||||||
pcFichierSesam: *const i8
|
|
||||||
});
|
|
||||||
|
|
||||||
ssv_function!(BINDINGS_V1_40_13::SSV_LireConfig, ssv_lire_config, {
|
|
||||||
pZDataOut: *mut *mut libc::c_void,
|
|
||||||
psTailleDataOut: *mut usize
|
|
||||||
});
|
|
||||||
|
|
||||||
ssv_function!(BINDINGS_V1_40_13::SSV_LireCartePS, ssv_lire_carte_ps, {
|
|
||||||
NomRessourcePS: *const i8,
|
|
||||||
NomRessourceLecteur: *const i8,
|
|
||||||
CodePorteurPS: *const i8,
|
|
||||||
pZDataOut: *mut *mut libc::c_void,
|
|
||||||
pTailleZone: *mut usize
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_library_path(version: &SupportedFsvVersion) -> String {
|
|
||||||
let root_path = get_library_root_path();
|
|
||||||
let library_name = get_library_name();
|
|
||||||
let version = version.as_str();
|
|
||||||
format!("{root_path}/{version}/lib/{library_name}")
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn sesam_ini_path(version: &SupportedFsvVersion) -> String {
|
|
||||||
let root_path = get_sesam_ini_root_path();
|
|
||||||
let version = version.as_str();
|
|
||||||
format!("{root_path}/{version}/conf/sesam.ini")
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_library_name() -> &'static str {
|
|
||||||
// TODO : Use libloading::library_filename to get platform-specific filename ?
|
|
||||||
"libssvlux64.so"
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_library_root_path() -> &'static str {
|
|
||||||
"/opt/santesocial/fsv"
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_sesam_ini_root_path() -> &'static str {
|
|
||||||
"/etc/opt/santesocial/fsv"
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use std::{ffi::CString, ptr};
|
|
||||||
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_initlib2() {
|
|
||||||
let lib_path = &get_library_path(&SupportedFsvVersion::V1_40_13);
|
|
||||||
let ssv_library = SSVLibrary::<V1_40_13>::new(lib_path).expect("SSVLibrary::new failed");
|
|
||||||
|
|
||||||
let sesam_ini_str =
|
|
||||||
CString::new(sesam_ini_path(&SupportedFsvVersion::V1_40_13)).expect("CString::new failed");
|
|
||||||
let result = unsafe { ssv_library.ssv_init_lib2(sesam_ini_str.as_ptr()) }.unwrap();
|
|
||||||
assert_eq!(result, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_lire_config_and_carte_ps() {
|
|
||||||
let lib_path = &get_library_path(&SupportedFsvVersion::V1_40_13);
|
|
||||||
let ssv_library = SSVLibrary::<V1_40_13>::new(lib_path).expect("SSVLibrary::new failed");
|
|
||||||
|
|
||||||
let sesam_ini_str =
|
|
||||||
CString::new(sesam_ini_path(&SupportedFsvVersion::V1_40_13)).expect("CString::new failed");
|
|
||||||
let result = unsafe { ssv_library.ssv_init_lib2(sesam_ini_str.as_ptr()) }.unwrap();
|
|
||||||
assert_eq!(result, 0);
|
|
||||||
|
|
||||||
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
|
||||||
let mut size: libc::size_t = 0;
|
|
||||||
let result = unsafe { ssv_library.ssv_lire_config(&mut buffer_ptr, &mut size) }.unwrap();
|
|
||||||
assert_eq!(result, 0);
|
|
||||||
unsafe { libc::free(buffer_ptr) };
|
|
||||||
|
|
||||||
let nom_ressource_ps =
|
|
||||||
CString::new("Gemalto PC Twin Reader (645D94C3) 00 00").expect("CString::new failed");
|
|
||||||
let nom_ressource_lecteur =
|
|
||||||
CString::new("Gemalto PC Twin Reader (645D94C3) 00 00").expect("CString::new failed");
|
|
||||||
let code_porteur_ps = CString::new("1234").expect("CString::new failed");
|
|
||||||
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
|
||||||
let mut size: libc::size_t = 0;
|
|
||||||
let result = unsafe {
|
|
||||||
ssv_library.ssv_lire_carte_ps(
|
|
||||||
nom_ressource_ps.as_ptr(),
|
|
||||||
nom_ressource_lecteur.as_ptr(),
|
|
||||||
code_porteur_ps.as_ptr(),
|
|
||||||
&mut buffer_ptr,
|
|
||||||
&mut size,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
.unwrap();
|
|
||||||
assert_eq!(result, 0);
|
|
||||||
unsafe { libc::free(buffer_ptr) };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,123 +0,0 @@
|
|||||||
/*
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
* (c) 2001 GIE SESAM-VITALE
|
|
||||||
*
|
|
||||||
* PROJET : Services de Gestion de Donnees
|
|
||||||
*
|
|
||||||
* FICHIER : sgd.h (v4)
|
|
||||||
*
|
|
||||||
* Declaration des prototypes des fonctions SGD pour les progiciels.
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __SGD_H__
|
|
||||||
#define __SGD_H__
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Inclusions
|
|
||||||
*/
|
|
||||||
#include <stddef.h>
|
|
||||||
#include "mc_sys_def.h"
|
|
||||||
|
|
||||||
/* Reservation d'un session d'echange. */
|
|
||||||
extern unsigned short API_ENTRY SGD_ReserverSession (size_t Taille, unsigned short* NumeroSession);
|
|
||||||
|
|
||||||
/* Redimensionnement d'une zone d'entree interne. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_RedimensionnerBuffer (unsigned short NumeroSession,
|
|
||||||
size_t NouvelleTaille);
|
|
||||||
|
|
||||||
/* Liberation d'une session d'echange. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_LibererSession (unsigned short NumeroSession);
|
|
||||||
|
|
||||||
/* Ajout d'un groupe. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_AjouterGroupe (unsigned short NumeroSession,
|
|
||||||
unsigned short IdGroupe);
|
|
||||||
|
|
||||||
/* Ajout d'un champ. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_AjouterChamp (unsigned short NumeroSession,
|
|
||||||
const char* ValeurChamp);
|
|
||||||
|
|
||||||
/* Ajout d'un champ d'octets. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_AjouterChampBin (unsigned short NumeroSession,
|
|
||||||
const char* ValeurChamp,
|
|
||||||
size_t TailleChamp);
|
|
||||||
|
|
||||||
/* Ajout d'un champ d'octets d'un Fichier. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_AjouterChampFichier (unsigned short NumeroSession,
|
|
||||||
const char* NomFichier);
|
|
||||||
|
|
||||||
/* Lecture du numero du groupe suivant. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_LireGroupeSuivant (unsigned short NumeroSession,
|
|
||||||
unsigned short IdGroupeCourant,
|
|
||||||
unsigned short OccurrenceGroupeCourant,
|
|
||||||
unsigned short* IdGroupeSuivant,
|
|
||||||
unsigned short* OccurrenceGroupeSuivant);
|
|
||||||
|
|
||||||
/* Lecture d'un champ. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_LireChamp (unsigned short NumeroSession,
|
|
||||||
unsigned short IdGroupe,
|
|
||||||
unsigned short OccurrenceGroupe,
|
|
||||||
unsigned short NumeroChamp,
|
|
||||||
char* ValeurChamp,
|
|
||||||
size_t* TailleMax);
|
|
||||||
|
|
||||||
/* Lecture d'un champ d'octets. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_LireChampBin (unsigned short NumeroSession,
|
|
||||||
unsigned short IdGroupe,
|
|
||||||
unsigned short OccurrenceGroupe,
|
|
||||||
unsigned short NumeroChamp,
|
|
||||||
char* ValeurChamp,
|
|
||||||
size_t* TailleMax);
|
|
||||||
|
|
||||||
/* Lecture d'un champ vers un fichier. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_LireChampFichier (unsigned short NumeroSession,
|
|
||||||
unsigned short IdGroupe,
|
|
||||||
unsigned short OccurrenceGroupe,
|
|
||||||
unsigned short NumeroChamp,
|
|
||||||
const char* NomFichier);
|
|
||||||
|
|
||||||
/* Activation de la trace. */
|
|
||||||
extern unsigned short API_ENTRY
|
|
||||||
SGD_InitTrace (const char* NomFichier,
|
|
||||||
const char* ModeOuverture,
|
|
||||||
unsigned short Module,
|
|
||||||
unsigned char Niveau);
|
|
||||||
|
|
||||||
/*Initialisation de SGD*/
|
|
||||||
unsigned short API_ENTRY SGD_Init(const char *fichierSesam);
|
|
||||||
|
|
||||||
/* Transmission de la zone d'entrée. */
|
|
||||||
extern unsigned short API_ENTRY SGD_LireZoneIn(unsigned short NumeroSession,
|
|
||||||
void** ZDonneesEntree,
|
|
||||||
size_t* TailleDonneesEntree);
|
|
||||||
|
|
||||||
/* Transmission de la zone de sortie. */
|
|
||||||
typedef void (API_ENTRY *LibererZoneMem) (void* Zone);
|
|
||||||
|
|
||||||
|
|
||||||
extern unsigned short API_ENTRY SGD_EcrireZoneOut(unsigned short NumeroSession,
|
|
||||||
void* ZDonneesSortie,
|
|
||||||
size_t TailleDonneesSortie,
|
|
||||||
LibererZoneMem Fonction);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,176 +0,0 @@
|
|||||||
/*
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
* (c) 2001-2003 GIE SESAM-VITALE
|
|
||||||
*
|
|
||||||
* PROJET : Services Reglementation et Tarification
|
|
||||||
*
|
|
||||||
* FICHIER : srt.h (v5)
|
|
||||||
*
|
|
||||||
* Declaration des prototypes des fonctions SRT
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __SRT_H__
|
|
||||||
#define __SRT_H__
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Inclusions
|
|
||||||
*/
|
|
||||||
#include <stddef.h>
|
|
||||||
/* Inclure le fichier de déclarations spécifiques système : win32def.h, macosdef.h, unixdef.h, etc. */
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Declarations des fonctions publiques "standards"
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Recherche de codes CCAM par mot cle. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_RechercherParMotCle)
|
|
||||||
(const char* MotCle,
|
|
||||||
unsigned long CadreRecherche,
|
|
||||||
void** ZDonneesSortie,
|
|
||||||
size_t* TailleDonneesSortie);
|
|
||||||
|
|
||||||
/* Recherche de codes CCAM par filtre. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_RechercherParFiltre)
|
|
||||||
(const char* Filtre,
|
|
||||||
void** ZDonneesSortie,
|
|
||||||
size_t* TailleDonneesSortie);
|
|
||||||
|
|
||||||
/* Consultation de donnees CCAM. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_ConsulterDonnee)
|
|
||||||
(const char* Identifiant,
|
|
||||||
const char* DateReference,
|
|
||||||
void* ZDonneesEntree,
|
|
||||||
size_t TailleDonneesEntree,
|
|
||||||
void** ZDonneesSortie,
|
|
||||||
size_t* TailleDonneesSortie);
|
|
||||||
|
|
||||||
/* Modification d'un champ mono-occurrent. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_ModifierDonnee)
|
|
||||||
(const char* Identifiant,
|
|
||||||
const char* DateEffet,
|
|
||||||
void* ZDonneesEntree,
|
|
||||||
size_t TailleDonneesEntree);
|
|
||||||
|
|
||||||
/* Annulation d'une modification */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_AnnulerModification)
|
|
||||||
(const char* Identifiant,
|
|
||||||
void* ZDonneesEntree,
|
|
||||||
size_t TailleDonneesEntree);
|
|
||||||
|
|
||||||
/* Controle de la validite d'une ou plusieurs donnees. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_ControlerDonnees)
|
|
||||||
(const char* Identifiant,
|
|
||||||
const char* DateReference,
|
|
||||||
void* ZDonneesEntree,
|
|
||||||
size_t TailleDonneesEntree,
|
|
||||||
unsigned char* Resultat);
|
|
||||||
|
|
||||||
/* Regle de gestion ou de tarification. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_AppliquerRegle)
|
|
||||||
(const char* Identifiant,
|
|
||||||
void* ZDonneesEntree,
|
|
||||||
size_t TailleDonneesEntree,
|
|
||||||
void** ZDonneesSortie,
|
|
||||||
size_t* TailleDonneesSortie);
|
|
||||||
|
|
||||||
/* Controle complet. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_ControleComplet)
|
|
||||||
(void* ZDonneesEntree,
|
|
||||||
size_t TailleDonneesEntree,
|
|
||||||
void** ZDonneesSortie,
|
|
||||||
size_t* TailleDonneesSortie);
|
|
||||||
|
|
||||||
/* Chargement du referentiel. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_InitLIB2)(const char* SesamIni);
|
|
||||||
|
|
||||||
/* Dechargement du referentiel. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_TermLIB)(void);
|
|
||||||
|
|
||||||
/* Sauvegarde des modifications. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_SauvegarderReferentiel)(const char* Commentaire);
|
|
||||||
|
|
||||||
/* Version du referentiel. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_LireVersion)
|
|
||||||
(void** ZDonneesSortie,
|
|
||||||
size_t* TailleDonneesSortie);
|
|
||||||
|
|
||||||
/* Activation de la trace. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_InitTrace)
|
|
||||||
(const char* pathConf,
|
|
||||||
const char* ModeOuverture,
|
|
||||||
unsigned short Module,
|
|
||||||
unsigned char Niveau);
|
|
||||||
|
|
||||||
/* Allocation d'une zone memoire. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_AllouerZoneMem)
|
|
||||||
(void** Zone,
|
|
||||||
size_t Taille);
|
|
||||||
|
|
||||||
/* Allocation d'une zone memoire. */
|
|
||||||
typedef void (API_ENTRY FARPTR SRT_LibererZoneMem) (void* Zone);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Declarations des fonctions publiques "simplifiees"
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Recherche de codes CCAM par mot cle. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_RechercherParMotCle_S)
|
|
||||||
(const char* MotCle,
|
|
||||||
unsigned long CadreRecherche,
|
|
||||||
unsigned short NumeroSession);
|
|
||||||
|
|
||||||
/* Recherche de codes CCAM par filtre. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_RechercherParFiltre_S)
|
|
||||||
(const char* Filtre,
|
|
||||||
unsigned short NumeroSession);
|
|
||||||
|
|
||||||
/* Consultation de donnees CCAM. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_ConsulterDonnee_S)
|
|
||||||
(const char* Identifiant,
|
|
||||||
const char* DateReference,
|
|
||||||
unsigned short NumeroSession);
|
|
||||||
|
|
||||||
/* Modification d'un champ mono-occurrent. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_ModifierDonnee_S)
|
|
||||||
(const char* Identifiant,
|
|
||||||
const char* DateEffet,
|
|
||||||
unsigned short NumeroSession);
|
|
||||||
|
|
||||||
/* Annulation des modifications d'une donnee. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_AnnulerModification_S)
|
|
||||||
(const char* Identifiant,
|
|
||||||
unsigned short NumeroSession);
|
|
||||||
|
|
||||||
/* Controle de la validite d'une ou plusieurs donnees. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_ControlerDonnees_S)
|
|
||||||
(const char* Identifiant,
|
|
||||||
const char* DateReference,
|
|
||||||
unsigned short NumeroSession,
|
|
||||||
unsigned char* Resultat);
|
|
||||||
|
|
||||||
/* Regle de gestion ou de tarification. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_AppliquerRegle_S)
|
|
||||||
(const char* Identifiant,
|
|
||||||
unsigned short NumeroSession);
|
|
||||||
|
|
||||||
/* Controle complet. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_ControleComplet_S)
|
|
||||||
(unsigned short NumeroSession);
|
|
||||||
|
|
||||||
/* Version du referentiel. */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SRT_LireVersion_S)
|
|
||||||
(unsigned short NumeroSession);
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,327 +0,0 @@
|
|||||||
/*
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
* (c) 2001-2003 GIE SESAM-VITALE
|
|
||||||
*
|
|
||||||
* PROJET : Services SESAM Vitale
|
|
||||||
*
|
|
||||||
* FICHIER : ssv.h
|
|
||||||
*
|
|
||||||
* Declaration des prototypes des fonctions SSV
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __SSV_H__
|
|
||||||
#define __SSV_H__
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Inclusions
|
|
||||||
*/
|
|
||||||
#include <stddef.h>
|
|
||||||
/* Inclure le fichier de déclarations spécifiques système :
|
|
||||||
win32def.h, macosdef.h, aixdef.h, etc. */
|
|
||||||
|
|
||||||
|
|
||||||
/****** FONCTIONS STANDARDS *********/
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_TraduireARL)
|
|
||||||
(short NbZDataIn,
|
|
||||||
void FARPTR FARPTR TZDataIn,
|
|
||||||
size_t FARPTR TTailleZoneIn,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireCartePS)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireConfig)
|
|
||||||
(void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR psTailleDataOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterFactures)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
char cFactureACreer,
|
|
||||||
char cModeSecur,
|
|
||||||
void FARPTR pZDataIn,
|
|
||||||
size_t TailleDataIn,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterLot)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
short NBZDataIn,
|
|
||||||
void FARPTR FARPTR TZDataIn,
|
|
||||||
size_t FARPTR TTailleZoneIn,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterFichier)
|
|
||||||
(void FARPTR pZDataIn,size_t TailleDataIn,
|
|
||||||
void FARPTR FARPTR pZDataOut,size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_InitTrace)
|
|
||||||
(char FARPTR pathConf, char FARPTR ModeOuverture,
|
|
||||||
unsigned short Module, unsigned char Niveau);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_AllouerZoneMem)
|
|
||||||
(void FARPTR FARPTR pZDataIn,
|
|
||||||
size_t taille);
|
|
||||||
|
|
||||||
typedef void (API_ENTRY FARPTR SSV_LibererZoneMem)
|
|
||||||
(void FARPTR pZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_MajDateLecteur)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcDateHeure);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireDateLecteur)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
char FARPTR pcDateHeure);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireDroitsVitale)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR DateConsultation,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_IdentifierTLA)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR NumVersionCDC,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR tailleDataOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFacturesPdT)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
short sNbZDataIn,
|
|
||||||
void FARPTR FARPTR pvTZDataIn,
|
|
||||||
size_t FARPTR psTTailleDataIn,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFSETLA)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFSETLANC)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_EffacerTLA)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR cNumFacturation,
|
|
||||||
const char FARPTR cTypeDonnee);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerFacturesPdT)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcNumFacturation,
|
|
||||||
short sNbZDataIn,
|
|
||||||
void FARPTR FARPTR pvTZDataIn,
|
|
||||||
size_t FARPTR psTTailleDataIn,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerAppli)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
short sNbZDataIn,
|
|
||||||
void FARPTR FARPTR pvTZDataIn,
|
|
||||||
size_t FARPTR psTTailleDataIn);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerDonneesTLA)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
short sNbZDataIn,
|
|
||||||
void FARPTR FARPTR pvTZDataIn,
|
|
||||||
size_t FARPTR psTTailleDataIn);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerBeneficiaires)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR cNumFacturation,
|
|
||||||
short FARPTR sNbZDataOut,
|
|
||||||
void FARPTR FARPTR pTZDataOut,
|
|
||||||
size_t FARPTR sTTailleDataOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_TraduireFSE)
|
|
||||||
(void FARPTR pZDataIn,
|
|
||||||
size_t TailleDataIn,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_SecuriserFacture)
|
|
||||||
(const char FARPTR pcNomRessourcePS,
|
|
||||||
const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcCodePorteurPS,
|
|
||||||
char cNologSituation,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
void FARPTR pvDataIn,
|
|
||||||
size_t szTailleDataIn ,
|
|
||||||
void FARPTR FARPTR pvDataOut,
|
|
||||||
size_t FARPTR pszTailleDataOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_InitLIB2) (const char FARPTR pcFichierSesam);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_TermLIB)();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/****** FONCTIONS SIMPLIFIEES *********/
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_TraduireARL)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireCartePS)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireConfig)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterFactures)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
char cFacturesACreer,
|
|
||||||
char ModeSecur,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterLot)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterFichier)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_InitTrace)
|
|
||||||
(char FARPTR NomFichier, char FARPTR ModeOuverture,
|
|
||||||
unsigned short Module, unsigned char Niveau);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_MajDateLecteur)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcDateHeure);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireDateLecteur)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
char FARPTR pcDateHeure);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireDroitsVitale)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR DateConsultation,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_IdentifierTLA)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR NumVersionCDC,
|
|
||||||
unsigned short numeroSession );
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFacturesPdT)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFSETLA)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFSETLANC)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_EffacerTLA)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR cNumFacturation,
|
|
||||||
const char FARPTR cTypeDonnee);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerFacturesPdT)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcNumFacturation,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerAppli)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerDonneesTLA)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerBeneficiaires)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR cNumFacturation,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_TraduireFSE)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_SecuriserFacture)
|
|
||||||
( const char FARPTR pcNomRessourcePS,
|
|
||||||
const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcCodePorteurPS,
|
|
||||||
char cNologSituation,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,412 +0,0 @@
|
|||||||
/*
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
* (c) 2001-2003 GIE SESAM-VITALE
|
|
||||||
*
|
|
||||||
* PROJET : Services SESAM Vitale
|
|
||||||
*
|
|
||||||
* FICHIER : ssv.h
|
|
||||||
*
|
|
||||||
* Declaration des prototypes des fonctions SSV
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __SSV_H__
|
|
||||||
#define __SSV_H__
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Inclusions
|
|
||||||
*/
|
|
||||||
#include <stddef.h>
|
|
||||||
/* Inclure le fichier de déclarations spécifiques système :
|
|
||||||
win32def.h, macosdef.h, aixdef.h, etc. */
|
|
||||||
|
|
||||||
|
|
||||||
/****** FONCTIONS STANDARDS *********/
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_TraduireARL)
|
|
||||||
(short NbZDataIn,
|
|
||||||
void FARPTR FARPTR TZDataIn,
|
|
||||||
size_t FARPTR TTailleZoneIn,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireCartePS)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireConfig)
|
|
||||||
(void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR psTailleDataOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterFactures)
|
|
||||||
(char cFactureACreer,
|
|
||||||
char cModeSecur,
|
|
||||||
char cTypeFlux,
|
|
||||||
void FARPTR pZDataIn,
|
|
||||||
size_t TailleDataIn,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChiffrerFacture)
|
|
||||||
(void * pZDataIn,
|
|
||||||
size_t TailleDataIn,
|
|
||||||
void * * pZDataOut,
|
|
||||||
size_t * pTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_SignerFactureVitale)
|
|
||||||
(const char * pcNomRessourceVitale,
|
|
||||||
void * pZDataIn,
|
|
||||||
size_t szTailleDataIn,
|
|
||||||
void * * pZDataOut,
|
|
||||||
size_t * pszTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_CalculerHashFactureAssure)
|
|
||||||
(const char * pcNumSerie,
|
|
||||||
void * pZDataIn,
|
|
||||||
size_t szTailleDataIn,
|
|
||||||
void * * pZDataOut,
|
|
||||||
size_t * pszTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_AjouterSignatureAssureDansFacture)
|
|
||||||
(void * pZDataIn,
|
|
||||||
size_t szTailleDataIn,
|
|
||||||
void * * pZDataOut,
|
|
||||||
size_t * pszTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_SignerFactureCPS)
|
|
||||||
(const char * pcNomRessourcePS,
|
|
||||||
const char * pcNomRessourceLecteur,
|
|
||||||
const char * pcCodePorteurPS,
|
|
||||||
char cNologSituation,
|
|
||||||
void * pZDataIn,
|
|
||||||
size_t szTailleDataIn,
|
|
||||||
void * * pZDataOut,
|
|
||||||
size_t * pszTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY SSV_CalculerHashFacturePS)
|
|
||||||
(const char * pcNumSerieCPS,
|
|
||||||
void * pZDataIn,
|
|
||||||
size_t usTailleDataIn,
|
|
||||||
void * * pZDataOut,
|
|
||||||
size_t * pusTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY SSV_AjouterSignaturePSFacture)
|
|
||||||
(void * pZDataIn,
|
|
||||||
size_t szTailleDataIn,
|
|
||||||
void * * pZDataOut,
|
|
||||||
size_t * pszTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_SignerLotCPS)
|
|
||||||
(const char * pcNomRessourcePS,
|
|
||||||
const char * pcNomRessourceLecteur,
|
|
||||||
const char * pcCodePorteurPS,
|
|
||||||
char cNologSituation,
|
|
||||||
void * pZDataIn,
|
|
||||||
size_t szTailleDataIn,
|
|
||||||
void * * pZDataOut,
|
|
||||||
size_t * pszTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterLot)
|
|
||||||
( short NBZDataIn,
|
|
||||||
void FARPTR FARPTR TZDataIn,
|
|
||||||
size_t FARPTR TTailleZoneIn,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_FormaterFichier)
|
|
||||||
(void FARPTR pZDataIn,size_t TailleDataIn,
|
|
||||||
void FARPTR FARPTR pZDataOut,size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_InitTrace)
|
|
||||||
(char FARPTR pathConf, char FARPTR ModeOuverture,
|
|
||||||
unsigned short Module, unsigned char Niveau);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_AllouerZoneMem)
|
|
||||||
(void FARPTR FARPTR pZDataIn,
|
|
||||||
size_t taille);
|
|
||||||
|
|
||||||
typedef void (API_ENTRY FARPTR SSV_LibererZoneMem)
|
|
||||||
(void FARPTR pZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_MajDateLecteur)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcDateHeure);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireDateLecteur)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
char FARPTR pcDateHeure);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_LireDroitsVitale)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR DateConsultation,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_IdentifierTLA)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR NumVersionCDC,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR tailleDataOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFacturesPdT)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
short sNbZDataIn,
|
|
||||||
void FARPTR FARPTR pvTZDataIn,
|
|
||||||
size_t FARPTR psTTailleDataIn,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFSETLA)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerFSETLANC)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_EffacerTLA)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR cNumFacturation,
|
|
||||||
const char FARPTR cTypeDonnee);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerFacturesPdT)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcNumFacturation,
|
|
||||||
short sNbZDataIn,
|
|
||||||
void FARPTR FARPTR pvTZDataIn,
|
|
||||||
size_t FARPTR psTTailleDataIn,
|
|
||||||
short FARPTR pNbZDataOut,
|
|
||||||
void FARPTR FARPTR TZDataOut,
|
|
||||||
size_t FARPTR TTailleZoneOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerAppli)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
short sNbZDataIn,
|
|
||||||
void FARPTR FARPTR pvTZDataIn,
|
|
||||||
size_t FARPTR psTTailleDataIn);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_ChargerDonneesTLA)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
short sNbZDataIn,
|
|
||||||
void FARPTR FARPTR pvTZDataIn,
|
|
||||||
size_t FARPTR psTTailleDataIn);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_DechargerBeneficiaires)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR cNumFacturation,
|
|
||||||
short FARPTR sNbZDataOut,
|
|
||||||
void FARPTR FARPTR pTZDataOut,
|
|
||||||
size_t FARPTR sTTailleDataOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_TraduireFSE)
|
|
||||||
(void FARPTR pZDataIn,
|
|
||||||
size_t TailleDataIn,
|
|
||||||
void FARPTR FARPTR pZDataOut,
|
|
||||||
size_t FARPTR pTailleZone);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_SecuriserFacture)
|
|
||||||
(const char FARPTR pcNomRessourcePS,
|
|
||||||
const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcCodePorteurPS,
|
|
||||||
char cNologSituation,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
void FARPTR pvDataIn,
|
|
||||||
size_t szTailleDataIn ,
|
|
||||||
void FARPTR FARPTR pvDataOut,
|
|
||||||
size_t FARPTR pszTailleDataOut);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_InitLIB2) (const char FARPTR pcFichierSesam);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SSV_TermLIB)();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/****** FONCTIONS SIMPLIFIEES *********/
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_TraduireARL)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireCartePS)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireConfig)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterFactures)
|
|
||||||
(char cFacturesACreer,
|
|
||||||
char ModeSecur,
|
|
||||||
char cTypeFlux,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChiffrerFacture)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_SignerFactureVitale)
|
|
||||||
(const char * pcNomRessourceVitale,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_CalculerHashFactureAssure)
|
|
||||||
(const char * pcNumSerie,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_AjouterSignatureAssureDansFacture)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_SignerFactureCPS)
|
|
||||||
(const char * pcNomRessourcePS,
|
|
||||||
const char * pcNomRessourceLecteur,
|
|
||||||
const char * pcCodePorteurPS,
|
|
||||||
char cNologSituation,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (SIS_CalculerHashFacturePS)
|
|
||||||
(const char * pcNumSerieCPS,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY SIS_AjouterSignaturePSFacture)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_SignerLotCPS)
|
|
||||||
(const char * pcNomRessourcePS,
|
|
||||||
const char * pcNomRessourceLecteur,
|
|
||||||
const char * pcCodePorteurPS,
|
|
||||||
char cNologSituation,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterLot)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_FormaterFichier)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_InitTrace)
|
|
||||||
(char FARPTR NomFichier, char FARPTR ModeOuverture,
|
|
||||||
unsigned short Module, unsigned char Niveau);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_MajDateLecteur)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcDateHeure);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireDateLecteur)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
char FARPTR pcDateHeure);
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_LireDroitsVitale)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR DateConsultation,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_IdentifierTLA)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR NumVersionCDC,
|
|
||||||
unsigned short numeroSession );
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFacturesPdT)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFSETLA)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerFSETLANC)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_EffacerTLA)
|
|
||||||
(const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR cNumFacturation,
|
|
||||||
const char FARPTR cTypeDonnee);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerFacturesPdT)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcNumFacturation,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerAppli)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_ChargerDonneesTLA)
|
|
||||||
(const char FARPTR pcNomRessourceLecteur,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_DechargerBeneficiaires)
|
|
||||||
( const char FARPTR NomRessourcePS,
|
|
||||||
const char FARPTR NomRessourceLecteur,
|
|
||||||
const char FARPTR CodePorteurPS,
|
|
||||||
const char FARPTR cNumFacturation,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_TraduireFSE)
|
|
||||||
(unsigned short numeroSession);
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SIS_SecuriserFacture)
|
|
||||||
( const char FARPTR pcNomRessourcePS,
|
|
||||||
const char FARPTR pcNomRessourceLecteur,
|
|
||||||
const char FARPTR pcCodePorteurPS,
|
|
||||||
char cNologSituation,
|
|
||||||
const char FARPTR pcNumFact,
|
|
||||||
unsigned short numeroSession);
|
|
||||||
|
|
||||||
|
|
||||||
/* inclusion temporaire dans ssv.h pour ne pas a avoir à relivrer Sedica (pas d'incidence sur le code) -> à inclure dans sedica.h ou commun.h*/
|
|
||||||
/* Chaine discriminante d un nom de ressource TL PCSC */
|
|
||||||
#define TL_PCSC " TL "
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,353 +0,0 @@
|
|||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% PROJET : STS INTERFACE
|
|
||||||
%
|
|
||||||
% MODULE : HEADER STS INTERFACE
|
|
||||||
%
|
|
||||||
% VERSION : cf #define ci-après
|
|
||||||
%
|
|
||||||
% FICHIER : sts.h
|
|
||||||
%
|
|
||||||
% Déclaration des prototypes des fonctions STS - INTERFACE
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
%
|
|
||||||
% EDS DHU - 09/04/03 - Création du .h
|
|
||||||
%
|
|
||||||
% EDS OCL - 06/06/03 - Defect 91 : Rectification du prototype de InitTrace()
|
|
||||||
%
|
|
||||||
% EDS OCL - 04/07/03 - Defect 115 : Nettoyage de stsitf.h (devenu sts.h)
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __STSITF_H
|
|
||||||
#define __STSITF_H
|
|
||||||
#define __STSITF_VERSION "0103"
|
|
||||||
/* Ne pas oublier d'impacter idef.h aussi */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
% Bibliothèques ANSI ou système
|
|
||||||
%------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
% Fichiers h inclus
|
|
||||||
%------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "sys_dep.h"
|
|
||||||
/*
|
|
||||||
% Macros et Constantes
|
|
||||||
%---------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* OCL - Defect 115 : Suppression du #define G_xxx ici même */
|
|
||||||
|
|
||||||
/* OCL - Defect 115 : Suppression du second #ifdef _cplusplus ici même */
|
|
||||||
|
|
||||||
|
|
||||||
/*********************************************************************************
|
|
||||||
************************* Fonctions réentrantes *********************************
|
|
||||||
*********************************************************************************/
|
|
||||||
|
|
||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% STS_Tarification
|
|
||||||
%
|
|
||||||
% Rôle : Tarification de la part complémentaire des actes de la facture
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée :
|
|
||||||
% MotifAppel (char) : 1er appel ('P') ou Appel sur echec de
|
|
||||||
% tarification ('E').
|
|
||||||
% ZDonneesEntree (void*) : Zone d'échange fournie par le Progiciel
|
|
||||||
% contenant toutes les informations sur la facture
|
|
||||||
% TailleDonneesEntree (size_t) : Taille de la zone d'échange Zin
|
|
||||||
%
|
|
||||||
% Paramètres de sortie :
|
|
||||||
% ZDonneesSortie (void**) : Zone d'échange fournie par le module STS appelé
|
|
||||||
% contenant toutes les informations modifiées de la facture
|
|
||||||
% en entrée et de nouvelles informations.
|
|
||||||
% TailleDonneesSortie (size_t*) : Taille de la zone d'échange Zout
|
|
||||||
%
|
|
||||||
% Valeur retournée :
|
|
||||||
% OK si pas d'erreur
|
|
||||||
% ERR_STS_NON_INITIALISE si module STS non initialisé
|
|
||||||
% et les codes d'erreurs de la tarification du module STS appelé
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_Tarification)(char MotifAppel, void FARPTR ZDonneesEntree,
|
|
||||||
size_t TailleDonneesEntree, void FARPTR FARPTR ZDonneesSortie,
|
|
||||||
size_t FARPTR TailleDonneesSortie);
|
|
||||||
|
|
||||||
/* Fonction simplifiée */
|
|
||||||
/* OCL - Defect 115 : Remplacement STS_SIM par SGD */
|
|
||||||
#ifdef SGD
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_Tarification_S)(char MotifAppel, unsigned short NumeroSession);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% STS_Assistance
|
|
||||||
%
|
|
||||||
% Rôle : Assistance à la facturation.
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée :
|
|
||||||
% MotifAppel (char) : 1er appel ('P') ou Appel sur echec de
|
|
||||||
% tarification ('E').
|
|
||||||
% PorteeAppel (ushort) : 0 pour une assistance sur toute la facture.
|
|
||||||
% 1..n pour une assistance sur un acte de rang donné /zone
|
|
||||||
% ZDonneesEntree (void*) : Zone d'échange fournie par le Progiciel
|
|
||||||
% contenant toutes les informations sur la facture
|
|
||||||
% TailleDonneesEntree (size_t) : Taille de la zone d'échange Zin
|
|
||||||
%
|
|
||||||
% Paramètres de sortie :
|
|
||||||
% ZDonneesSortie (void**) : Zone d'échange fournie par le module STS appelé
|
|
||||||
% TailleDonneesSortie (size_t*) : Taille de la zone d'échange Zout
|
|
||||||
%
|
|
||||||
% Valeur retournée : (idem Tarification)
|
|
||||||
% OK si pas d'erreur
|
|
||||||
% ERR_STS_NON_INITIALISE si module STS non initialisé
|
|
||||||
% et les codes d'erreurs de la tarification du module STS appelé
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_Assistance)(char MotifAppel, unsigned short PorteeAppel,
|
|
||||||
void FARPTR ZDonneesEntree, size_t TailleDonneesEntree,
|
|
||||||
void FARPTR FARPTR ZDonneesSortie, size_t FARPTR TailleDonneesSortie);
|
|
||||||
|
|
||||||
/* Fonction simplifiée */
|
|
||||||
#ifdef SGD
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_Assistance_S)(char MotifAppel, unsigned short PorteeAppel,
|
|
||||||
unsigned short NumeroSession);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% STS_LireVersion
|
|
||||||
%
|
|
||||||
% Rôle : Lecture de la version de ce module et du fichier de ces tables externes
|
|
||||||
% dans le groupe 3780. Appeller la lecture de version de chaque module STS
|
|
||||||
% puis recopier la réponse 3780 de chacun dans la zone de sortie.
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée : aucun
|
|
||||||
%
|
|
||||||
% Paramètres de sortie :
|
|
||||||
% ZDonneesSortie (void**) : Zone d'échange fournie par ce module
|
|
||||||
% contenant les versions (grp 3780) demandées.
|
|
||||||
% TailleDonneesSortie (size_t*) : Taille de la zone d'échange Zout
|
|
||||||
%
|
|
||||||
% Valeur retournée :
|
|
||||||
% OK si pas d'erreur
|
|
||||||
% ERR_STS_NON_INITIALISE si module STS non initialisé
|
|
||||||
% ERR_ZOUT si ZDonneesSortie==NULL ou TailleDonneesSortie==NULL
|
|
||||||
% ERR_ZONE_ALLOC si mémoire insuffisante pour allouer la Zout
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_LireVersion)(void FARPTR FARPTR ZDonneesSortie, size_t FARPTR TailleDonneesSortie);
|
|
||||||
|
|
||||||
/* Fonction simplifiée */
|
|
||||||
#ifdef SGD
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_LireVersion_S)(unsigned short NumeroSession);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% STS_InitTrace
|
|
||||||
%
|
|
||||||
% Rôle : Initialisation des traces du module STS-Interface dans un fichier log.
|
|
||||||
% Cette fonction permet d'activer ou désactiver (niveau 0) les
|
|
||||||
% traces. Une activation requiert un nom de fichier et un mode
|
|
||||||
% d'ouverture. Un changement de niveau peut se faire sur le même
|
|
||||||
% fichier ou sur un différent s'il est précisé en entrée
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée :
|
|
||||||
% NomFichier (char*) : Chemin et nom de fichier de trace
|
|
||||||
% ModeOuverture (char*) : Mode d'ouverture du fichier de trace
|
|
||||||
% "a", "w" (,"ab", "wb").
|
|
||||||
% Module (ushort) : n° de module 0 à 5 (6=TOUS)
|
|
||||||
% Niveau (uchar) : Niveau de trace : 0 signifie pas de trace, 1
|
|
||||||
% signifie traces de profondeur 8 et >=2 signifie traces sans limite
|
|
||||||
% de profondeur et activation traces module STS_SI
|
|
||||||
%
|
|
||||||
% Paramètres de sortie : aucun
|
|
||||||
%
|
|
||||||
% Valeur retournée :
|
|
||||||
% OK si pas d'erreur
|
|
||||||
% ERR_PARAM si NomFichier/ModeOuverture incorrect quand Niveau > 0
|
|
||||||
% ERR_TRACE_FILE si erreur d'ouverture du fichier de trace
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
/* OCL - Defect 91 : Rectification du prototype de InitTrace() */
|
|
||||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_InitTrace)(const char FARPTR pathConf, const char FARPTR ModeOuverture,
|
|
||||||
unsigned short Module, unsigned char Niveau);
|
|
||||||
|
|
||||||
/*********************************************************************************
|
|
||||||
************************* Fonctions d'initialisation et de terminaison *********
|
|
||||||
*********************************************************************************/
|
|
||||||
|
|
||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% STS_InitLIB
|
|
||||||
%
|
|
||||||
% Rôle : Initialisation du module STS-Interface : Chargement des tables externes
|
|
||||||
% et suivi de parc. Appel de l'nitialisation de chaque module STS
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée : aucun
|
|
||||||
%
|
|
||||||
% Paramètres de sortie : aucun
|
|
||||||
%
|
|
||||||
% Valeur retournée :
|
|
||||||
% OK si pas d'erreur
|
|
||||||
% ERR_INTERNE_ITF si erreur interne du module STS-Interface (ou STS SI)
|
|
||||||
% ERR_MEM_DISPO si plus de mémoire disponible
|
|
||||||
% ERR_PKG_PATH_INI si le chemin d'accès au fichier binaire est
|
|
||||||
% inconnu (fichier de configuration inaccessible ou information
|
|
||||||
% manquante)
|
|
||||||
% ERR_ITF_PKG_ACCES si fichier binaire de table inaccessible
|
|
||||||
% ERR_ITF_PKG_VER si version du fichier incohérent avec version du
|
|
||||||
% module STS-Interface (dans les deux sens)
|
|
||||||
% ERR_ITF_PKG_CRC si CRC du fichier binaire est incorrect
|
|
||||||
% ERR_ITF_PKG_FORME si format du fichier incorrect
|
|
||||||
% ERR_ITF_PKG_INCPT s'il manque une table dans le fichier binaire
|
|
||||||
% ERR_ITF_PKG_NOM si le nom du fichier est différent du nom dans
|
|
||||||
% l'en-tête du fichier.
|
|
||||||
% les codes suivants ne sont pas des erreurs fatales (non bloquant)
|
|
||||||
% mais juste des avertissements
|
|
||||||
% WAR_STS_DEJA_INITIALISE si module déjà initialisé
|
|
||||||
% WAR_ADM_PATH si chemin au suivi de parc non trouvé dans fichier
|
|
||||||
% de configuration des produits SV
|
|
||||||
% WAR_ADM_FILE si impossible de créer les fichiers de suivi de
|
|
||||||
% parc
|
|
||||||
% ET les codes de retour de chaque module STS appelé
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
/* extern unsigned short API_ENTRY STS_InitLIB(); */
|
|
||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% STS_InitLIB2
|
|
||||||
%
|
|
||||||
% Rôle : Initialisation du module STS-Interface : Chargement des tables externes
|
|
||||||
% et suivi de parc. Appel de l'nitialisation de chaque module STS
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée :
|
|
||||||
% NomFichierIni (char*) : Chemin et nom du fichier de configuration des
|
|
||||||
% produits SESAM Vitale du poste de travail (sesam.ini)
|
|
||||||
%
|
|
||||||
% Paramètres de sortie : aucun
|
|
||||||
%
|
|
||||||
% Valeur retournée :
|
|
||||||
% OK si pas d'erreur
|
|
||||||
% ERR_INTERNE_ITF si erreur interne du module STS-Interface (ou STS SI)
|
|
||||||
% ERR_MEM_DISPO si plus de mémoire disponible
|
|
||||||
% ERR_PKG_PATH_INI si le chemin d'accès au fichier binaire est
|
|
||||||
% inconnu (fichier de configuration inaccessible ou information
|
|
||||||
% manquante)
|
|
||||||
% ERR_ITF_PKG_ACCES si fichier binaire de table inaccessible
|
|
||||||
% ERR_ITF_PKG_VER si version du fichier incohérent avec version du
|
|
||||||
% module STS-Interface (dans les deux sens)
|
|
||||||
% ERR_ITF_PKG_CRC si CRC du fichier binaire est incorrect
|
|
||||||
% ERR_ITF_PKG_FORME si format du fichier incorrect
|
|
||||||
% ERR_ITF_PKG_INCPT s'il manque une table dans le fichier binaire
|
|
||||||
% ERR_ITF_PKG_NOM si le nom du fichier est différent du nom dans
|
|
||||||
% l'en-tête du fichier.
|
|
||||||
% les codes suivants ne sont pas des erreurs fatales (non bloquant)
|
|
||||||
% mais juste des avertissements
|
|
||||||
% WAR_STS_DEJA_INITIALISE si module déjà initialisé
|
|
||||||
% WAR_ADM_PATH si chemin au suivi de parc non trouvé dans fichier
|
|
||||||
% de configuration des produits SV
|
|
||||||
% WAR_ADM_FILE si impossible de créer les fichiers de suivi de
|
|
||||||
% parc
|
|
||||||
% ET les codes de retour de chaque module STS appelé
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_InitLIB2)(const char FARPTR nomFichierIni);
|
|
||||||
|
|
||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% STS_TermLIB
|
|
||||||
%
|
|
||||||
% Rôle : Terminaison du module STS-Interface : Déchargement des tables externes.
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée : aucun
|
|
||||||
%
|
|
||||||
% Paramètres de sortie : aucun
|
|
||||||
%
|
|
||||||
% Valeur retournée :
|
|
||||||
% OK si pas d'erreur
|
|
||||||
% ERR_INTERNE_ITF si erreur interne du module STS-Interface (ou STS SI)
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_TermLIB)(void);
|
|
||||||
|
|
||||||
/*********************************************************************************
|
|
||||||
************************* Fonctions de gestion de la mémoire *******************
|
|
||||||
*********************************************************************************/
|
|
||||||
|
|
||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% STS_AllouerZoneMem
|
|
||||||
%
|
|
||||||
% Rôle : Allocation d'une zone d'échange de sortie par STS Interface.
|
|
||||||
% Cette fonction permet la réallocation d'une zone d'échange.
|
|
||||||
% L'allocation d'une nouvelle zone d'échange nécessite un pointeur
|
|
||||||
% NULL en entrée !
|
|
||||||
% Cette fonctio est à utiliser conjointement avec STS_LibererZoneMem
|
|
||||||
% pour faciliter le Debugage (zone allouée par l'écrivain)
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée :
|
|
||||||
% Taille (size_t) : Taille de la zone d'échange à allouer.
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée et de sortie :
|
|
||||||
% Zone (void**) : Zone d'échange préallouée en entrée (ou NULL).
|
|
||||||
% Zone allouée (réallouée) par le module STS-Interface.
|
|
||||||
%
|
|
||||||
% Valeur retournée :
|
|
||||||
% OK si pas d'erreur
|
|
||||||
% ERR_ZOUT si Zone==NULL ou Taille==0
|
|
||||||
% ERR_ZONE_ALLOC si plus de mémoire disponible
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR STS_AllouerZoneMem)(void FARPTR FARPTR Zone, size_t Taille);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
% STS_LibererZoneMem
|
|
||||||
%
|
|
||||||
% Rôle : Libération de la zone d'échange de sortie par STS Interface.
|
|
||||||
%
|
|
||||||
% Paramètres d'entrée :
|
|
||||||
% Zone (void*) : Zone d'échange à libérer (allouée précédemment par
|
|
||||||
% le module STS-Interce par STS_AllouerZoneMem).
|
|
||||||
%
|
|
||||||
% Paramètres de sortie : aucun
|
|
||||||
%
|
|
||||||
% Valeur retournée : aucune
|
|
||||||
%
|
|
||||||
%-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
/* OCL - Defect 115 : Remplacement PTR par FARPTR */
|
|
||||||
typedef void (API_ENTRY FARPTR STS_LibererZoneMem)(void FARPTR Zone);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __STSITF_H */
|
|
||||||
@ -1,189 +0,0 @@
|
|||||||
/*---------------------------------------------------------------------------
|
|
||||||
PROJET : Couche de portabilite multi-systeme
|
|
||||||
|
|
||||||
PLATE-FORME: LINUX
|
|
||||||
|
|
||||||
MODULE : Definition des macros et des types utilises par la couche
|
|
||||||
d'abstraction systeme pour la plate-forme LINUX.
|
|
||||||
|
|
||||||
Le fichier de definition des types portable (ce fichier) doit
|
|
||||||
etre inclus avant tout autre .h de definitions d'APIS gip-cps.
|
|
||||||
Ce fichier definit tous les types et macros dependants du
|
|
||||||
systeme.
|
|
||||||
|
|
||||||
FICHIER : common\linux\src\linuxdef.h
|
|
||||||
|
|
||||||
VERSION : 1.00
|
|
||||||
|
|
||||||
DATE : 10/01/2001
|
|
||||||
|
|
||||||
AUTEUR : ALVARO ROCHA
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
Modifications: (nouvelle version, date, auteur, explication)
|
|
||||||
...
|
|
||||||
|
|
||||||
- V4.31 - AROC le 12/02/2001 :
|
|
||||||
Ajout des #define TRUE et FALSE ainsi que le typedef int BOOLEEN
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef __CPSCASDF_H
|
|
||||||
#define __CPSCASDF_H
|
|
||||||
|
|
||||||
/*----------------- definition des macros portables ------------------------*/
|
|
||||||
#ifndef far
|
|
||||||
#define far
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef FAR
|
|
||||||
#define FAR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PTR
|
|
||||||
#define PTR *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PVOID
|
|
||||||
#define PVOID void PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef FARPTR
|
|
||||||
#define FARPTR PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef FPVOID
|
|
||||||
#define FPVOID void FARPTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* AROC 12/02/2001 debut : */
|
|
||||||
#ifndef FALSE
|
|
||||||
#define FALSE 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef TRUE
|
|
||||||
#define TRUE 1
|
|
||||||
#endif
|
|
||||||
/* AROC 12/02/2001 fin */
|
|
||||||
|
|
||||||
/*----------------- definition des types portables ------------------------*/
|
|
||||||
#ifndef CHAR
|
|
||||||
#define CHAR char
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PCHAR
|
|
||||||
#define PCHAR CHAR PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PSTRG
|
|
||||||
#define PSTRG CHAR PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef UCHAR
|
|
||||||
#define UCHAR unsigned char
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PUCHAR
|
|
||||||
#define PUCHAR UCHAR PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef INT8
|
|
||||||
#define INT8 char
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef INT16
|
|
||||||
#define INT16 short
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef INT32
|
|
||||||
#define INT32 long
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PINT8
|
|
||||||
#define PINT8 INT8 PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PINT16
|
|
||||||
#define PINT16 INT16 PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PINT32
|
|
||||||
#define PINT32 INT32 PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef UINT8
|
|
||||||
#define UINT8 unsigned char
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef UINT16
|
|
||||||
#define UINT16 unsigned short
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef UINT32
|
|
||||||
#define UINT32 unsigned long
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PUINT8
|
|
||||||
#define PUINT8 UINT8 PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PUINT16
|
|
||||||
#define PUINT16 UINT16 PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PUINT32
|
|
||||||
#define PUINT32 UINT32 PTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* 11/02/1997 : Ajout DRE pour CPSCAS */
|
|
||||||
#ifndef VOID
|
|
||||||
#define VOID void
|
|
||||||
#endif
|
|
||||||
#ifndef PSTR
|
|
||||||
#define PSTR char PTR
|
|
||||||
#endif
|
|
||||||
/* 11/02/1997 : Fin */
|
|
||||||
|
|
||||||
#ifndef WORD
|
|
||||||
#define WORD unsigned short
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef DWORD
|
|
||||||
#define DWORD unsigned long
|
|
||||||
#endif
|
|
||||||
//typedef unsigned char BYTE;
|
|
||||||
#ifndef BYTE
|
|
||||||
#define BYTE unsigned char
|
|
||||||
#endif
|
|
||||||
//typedef BYTE far * LPBYTE;
|
|
||||||
#ifndef LPBYTE
|
|
||||||
#define LPBYTE BYTE far *
|
|
||||||
#endif
|
|
||||||
//typedef int BOOL;
|
|
||||||
#ifndef BOOL
|
|
||||||
#define BOOL int
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef Unref
|
|
||||||
#define Unref( a) a=a
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef min
|
|
||||||
#define min(a,b) ((a)>(b)?(b):(a))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef max
|
|
||||||
#define max(a,b) ((a)<(b)?(b):(a))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Taille maximale allouée par la fonction "malloc" */
|
|
||||||
#ifndef MAXBLOC
|
|
||||||
#define MAXBLOC 4294967295
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,85 +0,0 @@
|
|||||||
/*
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
* (c) 2002 GIE SESAM-VITALE
|
|
||||||
*
|
|
||||||
* FICHIER : sys_def.h (v2)
|
|
||||||
*
|
|
||||||
* PLATE-FORME : Windows 32 bits
|
|
||||||
*
|
|
||||||
* Définitions dépendantes du système.
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "linuxdef.h"
|
|
||||||
#include "stdlib.h"
|
|
||||||
|
|
||||||
#ifndef __SYS_DEF_H__
|
|
||||||
#define __SYS_DEF_H__
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef API_ENTRY
|
|
||||||
#define API_ENTRY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _MAX_PATH
|
|
||||||
#define _MAX_PATH 256
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _MAX_FNAME
|
|
||||||
#define _MAX_FNAME 160
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _MAX_DIR
|
|
||||||
#define _MAX_DIR 800
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef FARPTR
|
|
||||||
#define FARPTR *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_MAX_PATH
|
|
||||||
#define SYS_MAX_PATH _MAX_PATH
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_MAX_FNAME
|
|
||||||
#define SYS_MAX_FNAME _MAX_FNAME
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_MAX_DIR
|
|
||||||
#define SYS_MAX_DIR _MAX_DIR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_HANDLE
|
|
||||||
#define SYS_HANDLE void *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PTR
|
|
||||||
#define PTR *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYSFARPROC_
|
|
||||||
#define SYSFARPROC_
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SYSFARPROC)();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Séparateur utilisé dans le nommage des arborescences de fichiers */
|
|
||||||
#ifndef SEPARATEUR_REPERTOIRE
|
|
||||||
#define SEPARATEUR_REPERTOIRE '/'
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Activation des fonctions simplifiées. */
|
|
||||||
#ifndef SGD
|
|
||||||
#define SGD
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,92 +0,0 @@
|
|||||||
/*
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
* (c) 2002 GIE SESAM-VITALE
|
|
||||||
*
|
|
||||||
* FICHIER : sys_def.h (v2)
|
|
||||||
*
|
|
||||||
* PLATE-FORME : MAC OSX
|
|
||||||
*
|
|
||||||
* Définitions dépendantes du système.
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
//3/11/2004 Modification pour compilation MAC OS X
|
|
||||||
#include "osxdef.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include "stdlib.h"
|
|
||||||
|
|
||||||
#ifndef __SYS_DEF_H__
|
|
||||||
#define __SYS_DEF_H__
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//3-11-2004 Ajout pour MAc OS X
|
|
||||||
#define FALSE 0
|
|
||||||
#define TRUE 1
|
|
||||||
|
|
||||||
//3/11/2004 Modification pour compilation MAC OS X
|
|
||||||
#ifndef API_ENTRY
|
|
||||||
#define API_ENTRY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef FARPTR
|
|
||||||
#define FARPTR *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_MAX_PATH
|
|
||||||
#define SYS_MAX_PATH _MAX_PATH
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_MAX_FNAME
|
|
||||||
#define SYS_MAX_FNAME _MAX_FNAME
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_MAX_DIR
|
|
||||||
#define SYS_MAX_DIR _MAX_DIR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef PTR
|
|
||||||
#define PTR *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef SYS_HANDLE
|
|
||||||
//typedef void * SYS_HANDLE;
|
|
||||||
#define SYS_HANDLE void *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYSFARPROC_
|
|
||||||
#define SYSFARPROC_
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SYSFARPROC)();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Séparateur utilisé dans le nommage des arborescences de fichiers */
|
|
||||||
#ifndef SEPARATEUR_REPERTOIRE
|
|
||||||
#ifdef WIN32
|
|
||||||
#define SEPARATEUR_REPERTOIRE '\\'
|
|
||||||
#else
|
|
||||||
#define SEPARATEUR_REPERTOIRE '/'
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Activation des fonctions simplifiées. */
|
|
||||||
#ifndef SGD
|
|
||||||
#define SGD
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,150 +0,0 @@
|
|||||||
/*---------------------------------------------------------------------------
|
|
||||||
PROJET : Couche de portabilite multi-systeme
|
|
||||||
|
|
||||||
PLATE-FORME: MAC OS X
|
|
||||||
|
|
||||||
MODULE : Definition des macros et des types utilises par la couche
|
|
||||||
d'abstraction systeme pour la plate-forme LINUX.
|
|
||||||
|
|
||||||
Le fichier de definition des types portable (ce fichier) doit
|
|
||||||
etre inclus avant tout autre .h de definitions d'APIS gip-cps.
|
|
||||||
Ce fichier definit tous les types et macros dependants du
|
|
||||||
systeme.
|
|
||||||
|
|
||||||
FICHIER : common\linux\src\linuxdef.h
|
|
||||||
|
|
||||||
VERSION : 1.00
|
|
||||||
|
|
||||||
DATE : 10/01/2001
|
|
||||||
|
|
||||||
AUTEUR : ALVARO ROCHA
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
Modifications: (nouvelle version, date, auteur, explication)
|
|
||||||
...
|
|
||||||
|
|
||||||
- V4.31 - AROC le 12/02/2001 :
|
|
||||||
Ajout des #define TRUE et FALSE ainsi que le typedef int BOOLEEN
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
---------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef __CPSCASDF_H
|
|
||||||
#define __CPSCASDF_H
|
|
||||||
|
|
||||||
//#ifndef __MACTYPES__
|
|
||||||
/*#include <CarbonCore/MacTypes.h>*/
|
|
||||||
//#include"/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacTypes.h"*/
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*----------------- definition des macros portables ------------------------*/
|
|
||||||
|
|
||||||
|
|
||||||
/* point d'entree exporte en DLL ????????????????????????????????????????? */
|
|
||||||
#define API_ENTRY /* pour l'instant */
|
|
||||||
|
|
||||||
#define far
|
|
||||||
#define FAR
|
|
||||||
|
|
||||||
#define PTR *
|
|
||||||
|
|
||||||
#define PVOID void PTR
|
|
||||||
|
|
||||||
#ifndef FARPTR
|
|
||||||
#define FARPTR PTR
|
|
||||||
#endif
|
|
||||||
#define FPVOID void FARPTR
|
|
||||||
|
|
||||||
/* AROC 18/O4/2001 ajout pour io_comm*/
|
|
||||||
#define HCOMM unsigned int
|
|
||||||
#define PHCOMM HCOMM FARPTR
|
|
||||||
|
|
||||||
/* AROC 12/02/2001 debut : */
|
|
||||||
#ifndef FALSE
|
|
||||||
#define FALSE 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef TRUE
|
|
||||||
#define TRUE 1
|
|
||||||
#endif
|
|
||||||
/* AROC 12/02/2001 fin */
|
|
||||||
|
|
||||||
/*----------------- definition des types portables ------------------------*/
|
|
||||||
|
|
||||||
/* AROC 12/02/2001 debut : */
|
|
||||||
/* mise en commentaire de ce define car pb avec module sts où BOOLEEN est defini en char*/
|
|
||||||
//#ifndef BOOLEEN
|
|
||||||
//typedef int BOOLEEN;
|
|
||||||
//#define BOOLEEN int
|
|
||||||
//#endif
|
|
||||||
/* AROC 12/02/2001 fin */
|
|
||||||
/* Boolean */
|
|
||||||
#define BOOL Boolean
|
|
||||||
|
|
||||||
//#define _MAX_PATH 1024
|
|
||||||
typedef char CHAR;
|
|
||||||
typedef CHAR PTR PCHAR;
|
|
||||||
|
|
||||||
typedef CHAR PTR PSTRG;
|
|
||||||
|
|
||||||
typedef unsigned char UCHAR;
|
|
||||||
typedef UCHAR PTR PUCHAR;
|
|
||||||
|
|
||||||
typedef char INT8;
|
|
||||||
typedef short INT16;
|
|
||||||
typedef long INT32;
|
|
||||||
|
|
||||||
typedef INT8 PTR PINT8;
|
|
||||||
typedef INT16 PTR PINT16;
|
|
||||||
typedef INT32 PTR PINT32;
|
|
||||||
|
|
||||||
typedef unsigned char UINT8;
|
|
||||||
typedef unsigned short UINT16;
|
|
||||||
typedef unsigned long UINT32;
|
|
||||||
|
|
||||||
typedef UINT8 PTR PUINT8;
|
|
||||||
typedef UINT16 PTR PUINT16;
|
|
||||||
typedef UINT32 PTR PUINT32;
|
|
||||||
|
|
||||||
/* 11/02/1997 : Ajout DRE pour CPSCAS */
|
|
||||||
typedef void VOID;
|
|
||||||
typedef char PTR PSTR;
|
|
||||||
/* 11/02/1997 : Fin */
|
|
||||||
|
|
||||||
typedef unsigned short WORD;
|
|
||||||
typedef unsigned long DWORD;
|
|
||||||
typedef unsigned char BYTE;
|
|
||||||
typedef BYTE far * LPBYTE;
|
|
||||||
|
|
||||||
#define Unref( a) a=a
|
|
||||||
|
|
||||||
#ifndef min
|
|
||||||
#define min(a,b) ((a)>(b)?(b):(a))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef max
|
|
||||||
#define max(a,b) ((a)<(b)?(b):(a))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef LITTLE_ENDIAN
|
|
||||||
#undef LITTLE_ENDIAN
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PATH_MAX
|
|
||||||
#define PATH_MAX 1024
|
|
||||||
#endif
|
|
||||||
#ifndef _MAX_PATH
|
|
||||||
#define _MAX_PATH PATH_MAX /* PATH_MAX defini dans <usr/include/sys/syslimits.h> */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Taille maximale allouÈe par la fonction "malloc" */
|
|
||||||
#ifndef MAXBLOC
|
|
||||||
#define MAXBLOC 0x7FFFFFFF
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
/*
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
* (c) 2002 GIE SESAM-VITALE
|
|
||||||
*
|
|
||||||
* FICHIER : sys_def.h (v2)
|
|
||||||
*
|
|
||||||
* PLATE-FORME : Windows 32 bits
|
|
||||||
*
|
|
||||||
* Définitions dépendantes du système.
|
|
||||||
* -------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#ifndef __SYS_DEF_H__
|
|
||||||
#define __SYS_DEF_H__
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef API_ENTRY
|
|
||||||
#define API_ENTRY __stdcall
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef FARPTR
|
|
||||||
#define FARPTR *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_MAX_PATH
|
|
||||||
#define SYS_MAX_PATH _MAX_PATH
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_MAX_FNAME
|
|
||||||
#define SYS_MAX_FNAME _MAX_FNAME
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SYS_MAX_DIR
|
|
||||||
#define SYS_MAX_DIR _MAX_DIR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef void * SYS_HANDLE;
|
|
||||||
|
|
||||||
#ifndef PTR
|
|
||||||
#define PTR *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
typedef unsigned short (API_ENTRY FARPTR SYSFARPROC)();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Séparateur utilisé dans le nommage des arborescences de fichiers */
|
|
||||||
#ifndef SEPARATEUR_REPERTOIRE
|
|
||||||
#define SEPARATEUR_REPERTOIRE '\\'
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Activation des fonctions simplifiées. */
|
|
||||||
#ifndef SGD
|
|
||||||
#define SGD
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "fsv"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
anyhow = "1.0.89"
|
|
||||||
libc = "0.2.159"
|
|
||||||
num_enum = { version = "0.7.3", features = ["complex-expressions"] }
|
|
||||||
thiserror = "1.0.64"
|
|
||||||
|
|
||||||
fsv-sys = { path = "../fsv-sys" }
|
|
||||||
utils = { path = "../utils" }
|
|
||||||
@ -1 +0,0 @@
|
|||||||
mod ssv;
|
|
||||||
@ -1,183 +0,0 @@
|
|||||||
use num_enum::FromPrimitive;
|
|
||||||
use thiserror::Error;
|
|
||||||
|
|
||||||
#[derive(Error, Debug, Eq, PartialEq, FromPrimitive)]
|
|
||||||
#[repr(u16)]
|
|
||||||
/// Liste des codes d'erreur retournés par la librairie C SSV
|
|
||||||
/// Documentation: Manuel de programmation SSV - Annexe A (p. 215)
|
|
||||||
pub enum SSVErrorCodes {
|
|
||||||
#[error("La Carte du Professionnel de Santé est absente du lecteur.")]
|
|
||||||
CPSMissing = 0xF001,
|
|
||||||
#[error("La Carte du Professionnel de Santé bloquée après trois codes porteur erronés.")]
|
|
||||||
CPSBlocked = 0xF002,
|
|
||||||
#[error("Le code porteur présenté est erroné.")]
|
|
||||||
CPSPinWrong = 0xF003,
|
|
||||||
#[error("Carte du Professionnel de Santé non valide ou inexploitable par le Logiciel Lecteur. Vérifier la présence d'un Domaine d'Assurance Maladie (DAM).")]
|
|
||||||
CPSInvalid = 0xF004,
|
|
||||||
#[error("La Carte du Professionnel de Santé est retirée du lecteur.")]
|
|
||||||
CPSRemoved = 0xF005,
|
|
||||||
/// - Sécurisation d'une série de lots en cours.
|
|
||||||
/// - Pour les fonctions TLA (sauf Identifier TLA) : Cette erreur survient lorsque le simulateur TLA est en mode 1.50.
|
|
||||||
/// - Lire Date Lecteur, Mettre à jour Date Lecteur, Lire Droits Vitale : Cette erreur peut survenir lorsque le Logiciel Lecteur ne connaît pas la fonction sollicitée, c'est-à-dire si la version du Logiciel Lecteur est antérieure à 2.00.
|
|
||||||
/// - Décharger Données Bénéficiaires : cette erreur peut survenir pour signaler que le format des données issues du lecteur est incompatible avec cette version de SSV.
|
|
||||||
#[error("F022: Erreur commune à plusieurs fonctions.")]
|
|
||||||
F022 = 0xF022,
|
|
||||||
#[error("Message du lecteur incohérent. Débrancher et rebrancher le lecteur.")]
|
|
||||||
PCSCInconsistentMessage = 0xF0FF,
|
|
||||||
#[error("Le nom de lecteur fourni ne correspond à aucun lecteur reconnu.")]
|
|
||||||
PCSCReaderNotFound = 0xF101,
|
|
||||||
#[error("La fonction InitLIB2 n'est pas encore appelée ou la fonction TermLIB a déjà été appelée.")]
|
|
||||||
FunctionInitLib2NotCalled = 0xF600,
|
|
||||||
#[error("La bibliothèque SSV n’est pas chargée en mémoire. Vérifier que la fonction InitLIB2 a bien été appelée.")]
|
|
||||||
LibraryNotLoaded = 0xF690, // Warning
|
|
||||||
#[error("Carte vitale en opposition.")]
|
|
||||||
VitaleOpposition = 0xF6A1,
|
|
||||||
#[error("Zone de mémoire non allouée en sortie.")]
|
|
||||||
MemoryNotAllocated = 0xF800,
|
|
||||||
#[error("Erreur d'allocation de la zone de mémoire en sortie.")]
|
|
||||||
MemoryAllocationError = 0xF801,
|
|
||||||
#[error("Un des paramètres obligatoires d'entrée est non alloué ou invalide.")]
|
|
||||||
InputParameterNotAllocatedOrInvalid = 0xF802,
|
|
||||||
#[error("Zone de mémoire spécifiée en entrée non valide. Vérifier que la zone allouée ne dépasse pas la taille maximale autorisée (MAXBLOC).")]
|
|
||||||
InputMemoryInvalid = 0xF803,
|
|
||||||
#[error("Le format de la zone de mémoire d'entrée ou le nombre de zones mémoire est incorrect.")]
|
|
||||||
InputMemoryFormatIncorrect = 0xF810,
|
|
||||||
#[error("Problème lors de l’initialisation du protocole. Erreur du Ressource Manager PC/SC. Vérifiez le lecteur.")]
|
|
||||||
PCSCProtocolInitError = 0xFF01,
|
|
||||||
#[error("Time-out au niveau protocolaire ou transmission déjà en cours avec le lecteur. Vérifiez le lecteur et l'insertion de la carte.")]
|
|
||||||
PCSCProtocolTimeout = 0xFF02,
|
|
||||||
#[error("Taille insuffisante allouée en entrée d’une fonction du Resource Manager.")]
|
|
||||||
PCSCProtocolInputMemoryTooSmall = 0xFF03,
|
|
||||||
#[error("Erreur de transmission du protocole. Vérifiez le lecteur et l'insertion de la carte.")]
|
|
||||||
PCSCProtocolTransmissionError = 0xFF04,
|
|
||||||
#[error("Lecteur absent ou indisponible.")]
|
|
||||||
PCSCReaderMissingOrUnavailable = 0xFF05,
|
|
||||||
#[error("Le nom du lecteur transmis est inconnu du Resource Manager PC/SC.")]
|
|
||||||
PCSCReaderUnknown = 0xFF06,
|
|
||||||
#[error("Erreur inconnue remontée par le Resource Manager PC/SC.")]
|
|
||||||
PCSCUnknownError = 0xFF07,
|
|
||||||
#[error("Erreur interne Resource Manager PC/SC.")]
|
|
||||||
PCSCInternalError = 0xFF08,
|
|
||||||
#[error("Ressource PC/SC déjà prise en exclusivité. Vérifiez qu'une autre application n'utilise pas le lecteur.")]
|
|
||||||
PCSCResourceAlreadyExclusive = 0xFF09,
|
|
||||||
#[error("Protocole incompatible avec la carte à puce. Vérifiez l'insertion de la carte et son état.")]
|
|
||||||
PCSCProtocolIncompatible = 0xFF0A,
|
|
||||||
#[error("Paramètre incorrect. Erreur interne à la librairie SSV.")]
|
|
||||||
PCSCIncorrectParameter = 0xFF0B,
|
|
||||||
#[error("Carte absente. Insérez une carte dans le lecteur.")]
|
|
||||||
PCSCCardMissing = 0xFF0C,
|
|
||||||
#[error("L'état de la carte a été modifié (RAZ ou mise hors tension). Vérifiez si la carte n'a pas été retirée ou si une autre application n'utilise pas la carte.")]
|
|
||||||
PCSCCardStateChanged = 0xFF0D,
|
|
||||||
#[error("Carte muette ou non supportée. Vérifiez l'insertion de la carte.")]
|
|
||||||
PCSCCardUnsupported = 0xFF0E,
|
|
||||||
#[error("Code porteur CPS non renseigné.")]
|
|
||||||
CPSPinMissing = 0xFF21,
|
|
||||||
#[error("Ressource PC/SC déjà prise en exclusivité. Vérifiez que le processus en cours n'utilise pas déjà le lecteur.")]
|
|
||||||
PCSCReaderAlreadyExclusiveForCurrentProcess = 0xFF24,
|
|
||||||
#[error("Plusieurs lecteurs ou cartes de même type identifiés lors de la détection automatique.")]
|
|
||||||
PCSCDuplicatedReadersOrCardsDetected = 0xFF29,
|
|
||||||
#[error("Problème de chargement de la librairie cryptographique ou erreur retournée par la librairie cryptographique.")]
|
|
||||||
CryptoLibraryError = 0xFF30,
|
|
||||||
#[error("Erreurs internes aux Services SESAM-Vitale. Vérifiez les traces.")]
|
|
||||||
#[num_enum(alternatives = [0xFFF1..=0xFFFF])]
|
|
||||||
SSVInternalError = 0xFFF0,
|
|
||||||
#[error("Le fichier `tablebin.smc` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
|
||||||
FileMissingTablebinMsc = 0xF610, // tablebin.smc
|
|
||||||
#[error("Le fichier `scripts.sms` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
|
||||||
FileMissingScriptsSms = 0xF611, // scripts.sms
|
|
||||||
#[error("Le fichier `tablebin.ssv` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
|
||||||
FileMissingTablebinSsv = 0xF612, // tablebin.ssv
|
|
||||||
#[error("Le fichier `script.ssv` est inaccessible en lecture (inexistant ou pas de droits d'accès).")]
|
|
||||||
FileMissingScriptSsv = 0xF613, // script.ssv
|
|
||||||
#[error("La version du fichier `tablebin.smc` est incompatible avec la bibliothèque des SSV.")]
|
|
||||||
FileVersionIncompatibleTablebinMsc = 0xF620, // tablebin.smc
|
|
||||||
#[error("La version du fichier `scripts.sms` est incompatible avec la bibliothèque des SSV.")]
|
|
||||||
FileVersionIncompatibleScriptsSms = 0xF621, // scripts.sms
|
|
||||||
#[error("La version du fichier `tablebin.ssv` est incompatible avec la bibliothèque des SSV.")]
|
|
||||||
FileVersionIncompatibleTablebinSsv = 0xF622, // tablebin.ssv
|
|
||||||
#[error("La version du fichier `script.ssv` est incompatible avec la bibliothèque des SSV.")]
|
|
||||||
FileVersionIncompatibleScriptSsv = 0xF623, // script.ssv
|
|
||||||
#[error("L'intégrité du fichier `tablebin.smc` est incorrecte.")]
|
|
||||||
FileIntegrityIncorrectTablebinMsc = 0xF630, // tablebin.smc
|
|
||||||
#[error("L'intégrité du fichier `scripts.sms` est incorrecte.")]
|
|
||||||
FileIntegrityIncorrectScriptsSms = 0xF631, // scripts.sms
|
|
||||||
#[error("L'intégrité du fichier `tablebin.ssv` est incorrecte.")]
|
|
||||||
FileIntegrityIncorrectTablebinSsv = 0xF632, // tablebin.ssv
|
|
||||||
#[error("L'intégrité du fichier `script.ssv` est incorrecte.")]
|
|
||||||
FileIntegrityIncorrectScriptSsv = 0xF633, // script.ssv
|
|
||||||
#[error("La structure interne du fichier `tablebin.smc` est invalide.")]
|
|
||||||
FileStructureInvalidTablebinMsc = 0xF640, // tablebin.smc
|
|
||||||
#[error("La structure interne du fichier `scripts.sms` est invalide.")]
|
|
||||||
FileStructureInvalidScriptsSms = 0xF641, // scripts.sms
|
|
||||||
#[error("La structure interne du fichier `tablebin.ssv` est invalide.")]
|
|
||||||
FileStructureInvalidTablebinSsv = 0xF642, // tablebin.ssv
|
|
||||||
#[error("La structure interne du fichier `script.ssv` est invalide.")]
|
|
||||||
FileStructureInvalidScriptSsv = 0xF643, // script.ssv
|
|
||||||
#[error("Le fichier `tablebin.smc` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
|
||||||
FileLoadFailedTablebinMsc = 0xF650, // tablebin.smc
|
|
||||||
#[error("Le fichier `scripts.sms` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
|
||||||
FileLoadFailedScriptsSms = 0xF651, // scripts.sms
|
|
||||||
#[error("Le fichier `tablebin.ssv` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
|
||||||
FileLoadFailedTablebinSsv = 0xF652, // tablebin.ssv
|
|
||||||
#[error("Le fichier `script.ssv` n'a pas pu être chargé en mémoire. Essayez de libérer de la mémoire.")]
|
|
||||||
FileLoadFailedScriptSsv = 0xF653, // script.ssv
|
|
||||||
#[error("Le nom du fichier `tablebin.smc` est invalide.")]
|
|
||||||
FileNameInvalidTablebinMsc = 0xF660, // tablebin.smc
|
|
||||||
#[error("Le nom du fichier `scripts.sms` est invalide.")]
|
|
||||||
FileNameInvalidScriptsSms = 0xF661, // scripts.sms
|
|
||||||
#[error("Le nom du fichier `tablebin.ssv` est invalide.")]
|
|
||||||
FileNameInvalidTablebinSsv = 0xF662, // tablebin.ssv
|
|
||||||
#[error("Le nom du fichier `script.ssv` est invalide.")]
|
|
||||||
FileNameInvalidScriptSsv = 0xF663, // script.ssv
|
|
||||||
#[error("La fonction Initialiser Librairie est déjà appelée.")]
|
|
||||||
FunctionInitLib2AlreadyCalled = 0xF670, // Warning
|
|
||||||
#[error("Le fichier SESAM.INI est inaccessible en lecture (fichier ou droit d’accès manquant) ou ne contient pas le chemin des tables binaires des SSV.")]
|
|
||||||
SesamIniMissingFileOrTablebinPath = 0xF680,
|
|
||||||
#[error("Le chemin du répertoire de travail est absent du fichier SESAM.INI.")]
|
|
||||||
SesamIniMissingWorkDir = 0xF6F1,
|
|
||||||
#[error("Les fichiers d’extension adm ne sont pas accessibles en écriture.")]
|
|
||||||
AdmFilesNotWritable = 0xF6F2, // Warning
|
|
||||||
#[error("Aucune version de FSV du socle technique trouvé. Vérifier que la version du fichier script.sms est bonne.")]
|
|
||||||
NoFsvVersionFound = 0xF6F4,
|
|
||||||
#[error("Librairie SGD absente ou incomplète.")]
|
|
||||||
LibraryMissingOrIncompleteSGD = 0xF6F5,
|
|
||||||
#[error("Librairie SMC absente ou incomplète.")]
|
|
||||||
LibraryMissingOrIncompleteSMC = 0xF6F6,
|
|
||||||
#[error("Librairie SJS absente ou incomplète.")]
|
|
||||||
LibraryMissingOrIncompleteSJS = 0xF6F7,
|
|
||||||
#[error("Librairie SMS absente ou incomplète.")]
|
|
||||||
LibraryMissingOrIncompleteSMS = 0xF6F8,
|
|
||||||
#[error("Section MGC absente / clé RepertoireConfigTrace absente / fichier log4crc.xml non trouvé à l’emplacement indiqué par la clé RepertoireConfigTrace du fichier SESAM.INI.")]
|
|
||||||
SesamIniTracingConfigMissing = 0xFF22, // Warning
|
|
||||||
#[error("Interface Full PC/SC : problème de chargement de la librairie cryptographique ou erreur retournée par la librairie cryptographique.")]
|
|
||||||
PCSCInterfaceCryptoLibraryError = 0xFF25,
|
|
||||||
#[error("Valorisation incorrecte des paramètres de gestion de l'accès aux ressources dans le SESAM.INI. Vérifier les valeurs des clés tempoexclusivite, repetitionexclusivite, tempoexclusivitePCSC, repetitionexclusivitePCSC")]
|
|
||||||
SesamIniResourceAccessParamsIncorrect = 0xFF2A,
|
|
||||||
#[num_enum(catch_all)]
|
|
||||||
#[error("Erreur inattendue de la librairie SSV (code d'erreur: {0}).")]
|
|
||||||
Unexpected(u16),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_code_ranges() {
|
|
||||||
let error_code = 0xFFF1;
|
|
||||||
let error = SSVErrorCodes::from(error_code);
|
|
||||||
assert_eq!(error, SSVErrorCodes::SSVInternalError);
|
|
||||||
|
|
||||||
let error_code = 0xFFF8;
|
|
||||||
let error = SSVErrorCodes::from(error_code);
|
|
||||||
assert_eq!(error, SSVErrorCodes::SSVInternalError);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_catch_all() {
|
|
||||||
let error_code = 0xFBFF; // Not a valid error code
|
|
||||||
let error = SSVErrorCodes::from(error_code);
|
|
||||||
assert_eq!(error, SSVErrorCodes::Unexpected(0xFBFF));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,208 +0,0 @@
|
|||||||
use std::{ffi::CString, ptr};
|
|
||||||
|
|
||||||
use thiserror::Error;
|
|
||||||
|
|
||||||
use fsv_sys::{
|
|
||||||
get_library_path,
|
|
||||||
Error as FsvError,
|
|
||||||
SSVLibrary,
|
|
||||||
SSVLibraryCommon,
|
|
||||||
SupportedFsvVersion,
|
|
||||||
V1_40_13,
|
|
||||||
V1_40_14
|
|
||||||
};
|
|
||||||
|
|
||||||
mod errors_ssv;
|
|
||||||
use errors_ssv::SSVErrorCodes;
|
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
|
||||||
pub enum Error {
|
|
||||||
#[error(transparent)]
|
|
||||||
FSVSysLibrary(#[from] FsvError),
|
|
||||||
#[error(transparent)]
|
|
||||||
SSVError(#[from] SSVErrorCodes),
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Enum to hold the different versions of the SSV library
|
|
||||||
enum SsvLibraryVersion {
|
|
||||||
V1_40_13(SSVLibrary<V1_40_13>),
|
|
||||||
V1_40_14(SSVLibrary<V1_40_14>),
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Struct to hold the SSV library and access its functions
|
|
||||||
pub struct SSV {
|
|
||||||
library: SsvLibraryVersion,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl SSV {
|
|
||||||
fn new(version: SupportedFsvVersion) -> Result<Self, Error> {
|
|
||||||
let library = match version {
|
|
||||||
SupportedFsvVersion::V1_40_13 => {
|
|
||||||
let lib_path = get_library_path(&version);
|
|
||||||
let library = SSVLibrary::<V1_40_13>::new(&lib_path)?;
|
|
||||||
SsvLibraryVersion::V1_40_13(library)
|
|
||||||
},
|
|
||||||
SupportedFsvVersion::V1_40_14 => {
|
|
||||||
let lib_path = get_library_path(&version);
|
|
||||||
let library = SSVLibrary::<V1_40_14>::new(&lib_path)?;
|
|
||||||
SsvLibraryVersion::V1_40_14(library)
|
|
||||||
},
|
|
||||||
};
|
|
||||||
Ok(Self {
|
|
||||||
library,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Initialize the SSV library
|
|
||||||
/// Implement: SSV_InitLIB2
|
|
||||||
pub fn init_library(&self, sesam_ini_path: &str) -> Result<(), Error> {
|
|
||||||
let sesam_ini_path = CString::new(sesam_ini_path).expect("CString::new failed");
|
|
||||||
let result = match &self.library {
|
|
||||||
SsvLibraryVersion::V1_40_13(library) => {
|
|
||||||
unsafe { library.ssv_init_lib2(sesam_ini_path.as_ptr()) }?
|
|
||||||
},
|
|
||||||
SsvLibraryVersion::V1_40_14(library) => {
|
|
||||||
unsafe { library.ssv_init_lib2(sesam_ini_path.as_ptr()) }?
|
|
||||||
},
|
|
||||||
};
|
|
||||||
if result != 0 {
|
|
||||||
let error = SSVErrorCodes::from(result);
|
|
||||||
return Err(Error::SSVError(error));
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Read the CPS card
|
|
||||||
/// Implement: SSV_LireCartePS
|
|
||||||
pub fn read_professional_card(&self, pin_code: &str) -> Result<(), Error> {
|
|
||||||
let pcsc_reader_name = "Gemalto PC Twin Reader (645D94C3) 00 00";
|
|
||||||
|
|
||||||
let pin_code = CString::new(pin_code).expect("CString::new failed");
|
|
||||||
let pcsc_reader_name = CString::new(pcsc_reader_name).expect("CString::new failed");
|
|
||||||
let mut out_buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
|
||||||
let mut out_buffer_size: libc::size_t = 0;
|
|
||||||
|
|
||||||
let result = match &self.library {
|
|
||||||
SsvLibraryVersion::V1_40_13(library) => {
|
|
||||||
unsafe { library.ssv_lire_carte_ps(
|
|
||||||
pcsc_reader_name.as_ptr(),
|
|
||||||
pcsc_reader_name.as_ptr(),
|
|
||||||
pin_code.as_ptr(),
|
|
||||||
&mut out_buffer_ptr,
|
|
||||||
&mut out_buffer_size)
|
|
||||||
}?
|
|
||||||
},
|
|
||||||
SsvLibraryVersion::V1_40_14(library) => {
|
|
||||||
unsafe { library.ssv_lire_carte_ps(
|
|
||||||
pcsc_reader_name.as_ptr(),
|
|
||||||
pcsc_reader_name.as_ptr(),
|
|
||||||
pin_code.as_ptr(),
|
|
||||||
&mut out_buffer_ptr,
|
|
||||||
&mut out_buffer_size)
|
|
||||||
}?
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
if result != 0 {
|
|
||||||
// Free memory
|
|
||||||
unsafe { libc::free(out_buffer_ptr) };
|
|
||||||
let error = SSVErrorCodes::from(result);
|
|
||||||
return Err(Error::SSVError(error));
|
|
||||||
}
|
|
||||||
// Print 10 bytes of the buffer
|
|
||||||
let buffer = unsafe { std::slice::from_raw_parts(out_buffer_ptr as *const u8, 10) };
|
|
||||||
println!("{:?}", buffer);
|
|
||||||
// Free memory
|
|
||||||
unsafe { libc::free(out_buffer_ptr) };
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// # Get the configuration of the SSV library
|
|
||||||
/// Implement: SSV_LireConfig
|
|
||||||
pub fn get_config(&self) -> Result<(), Error> {
|
|
||||||
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
|
||||||
let mut size: libc::size_t = 0;
|
|
||||||
|
|
||||||
let result = match &self.library {
|
|
||||||
SsvLibraryVersion::V1_40_13(library) => {
|
|
||||||
unsafe { library.ssv_lire_config(&mut buffer_ptr, &mut size) }?
|
|
||||||
},
|
|
||||||
SsvLibraryVersion::V1_40_14(library) => {
|
|
||||||
unsafe { library.ssv_lire_config(&mut buffer_ptr, &mut size) }?
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
if result != 0 {
|
|
||||||
// Free memory
|
|
||||||
unsafe { libc::free(buffer_ptr) };
|
|
||||||
let error = SSVErrorCodes::from(result);
|
|
||||||
return Err(Error::SSVError(error));
|
|
||||||
}
|
|
||||||
// Print 10 bytes of the buffer
|
|
||||||
let buffer = unsafe { std::slice::from_raw_parts(buffer_ptr as *const u8, 10) };
|
|
||||||
println!("{:?}", buffer);
|
|
||||||
// Free memory
|
|
||||||
unsafe { libc::free(buffer_ptr) };
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use std::env;
|
|
||||||
|
|
||||||
use utils::config::load_config;
|
|
||||||
use anyhow::Result;
|
|
||||||
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
mod setup {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
pub fn init() -> Result<SSV> {
|
|
||||||
load_config().unwrap();
|
|
||||||
let sesam_ini_path = env::var("SESAM_INI_PATH").expect("SESAM_INI_PATH must be set");
|
|
||||||
let lib = SSV::new(SupportedFsvVersion::V1_40_13)?;
|
|
||||||
lib.init_library(&sesam_ini_path)?;
|
|
||||||
Ok(lib)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_init_library() -> Result<()> {
|
|
||||||
setup::init()?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_read_professional_card_good_pin() -> Result<()> {
|
|
||||||
let lib = setup::init()?;
|
|
||||||
let pin_code = "1234";
|
|
||||||
lib.read_professional_card(pin_code)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[ignore]
|
|
||||||
#[test]
|
|
||||||
fn test_read_professional_card_bad_pin() -> Result<()> {
|
|
||||||
let lib = setup::init()?;
|
|
||||||
let pin_code = "0000";
|
|
||||||
// Should return an error
|
|
||||||
let err = lib.read_professional_card(pin_code).unwrap_err();
|
|
||||||
assert_eq!(err.to_string(), "Le code porteur présenté est erroné.");
|
|
||||||
match err {
|
|
||||||
Error::SSVError(err) => {
|
|
||||||
assert_eq!(err as SSVErrorCodes, SSVErrorCodes::CPSPinWrong);
|
|
||||||
},
|
|
||||||
_ => panic!("Error type is not SSVError"),
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_get_config() -> Result<()> {
|
|
||||||
let lib = setup::init()?;
|
|
||||||
lib.get_config()?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
12
crates/services-sesam-vitale-sys/Cargo.toml
Normal file
12
crates/services-sesam-vitale-sys/Cargo.toml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
[package]
|
||||||
|
name = "services-sesam-vitale-sys"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
#links= "ssvlux64"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
bitvec = "1.0.1"
|
||||||
|
deku = "0.17.0"
|
||||||
|
libc = "0.2.155"
|
||||||
|
num_enum = { version = "0.7.3", features = ["complex-expressions"] }
|
||||||
|
thiserror = "1.0.63"
|
||||||
104
crates/services-sesam-vitale-sys/src/api.rs
Normal file
104
crates/services-sesam-vitale-sys/src/api.rs
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
use deku::{deku_derive, DekuContainerRead, DekuError, DekuReader};
|
||||||
|
use std::{ffi::CString, fmt, path::Path, ptr};
|
||||||
|
use thiserror::Error;
|
||||||
|
|
||||||
|
use crate::{
|
||||||
|
bindings::{SSV_InitLIB2, SSV_LireConfig, SSV_TermLIB},
|
||||||
|
types::{common::read_from_buffer, configuration::Configuration},
|
||||||
|
};
|
||||||
|
use num_enum::FromPrimitive;
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
pub struct SesamVitaleError {
|
||||||
|
code: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Eq, PartialEq, FromPrimitive)]
|
||||||
|
#[repr(u16)]
|
||||||
|
enum SSVIntError {
|
||||||
|
CPSNotInserted = 61441,
|
||||||
|
|
||||||
|
#[num_enum(catch_all)]
|
||||||
|
NotImplemented(u16),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_sesam_vitale_error() {
|
||||||
|
let int_error = SSVIntError::from(61441);
|
||||||
|
assert_eq!(int_error, SSVIntError::CPSNotInserted);
|
||||||
|
|
||||||
|
let int_error = SSVIntError::from(123);
|
||||||
|
assert_eq!(int_error, SSVIntError::NotImplemented(123));
|
||||||
|
println!("{:?}", int_error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Error, Debug)]
|
||||||
|
enum SSVError {
|
||||||
|
#[error("Erreur standard de la librairie SSV")]
|
||||||
|
SSVStandard,
|
||||||
|
// #[error("Erreur de parsing")]
|
||||||
|
// Parsing(#[from] ParsingError),
|
||||||
|
#[error("Erreur inattendue de la librairie SSV (TMP)")]
|
||||||
|
SSVUnknownTmp,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for SesamVitaleError {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
write!(f, "Got error code {} from SSV_LireConfig", self.code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn init_library(sesam_ini_path: &Path) -> Result<(), SesamVitaleError> {
|
||||||
|
// TODO: better error handling
|
||||||
|
let path_str = sesam_ini_path.to_str().unwrap();
|
||||||
|
let path_ptr = CString::new(path_str).expect("failed to create cstring");
|
||||||
|
|
||||||
|
let exit_code: u16 = unsafe { SSV_InitLIB2(path_ptr.as_ptr()) };
|
||||||
|
if exit_code != 0 {
|
||||||
|
let error = SesamVitaleError { code: exit_code };
|
||||||
|
return Err(error);
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
pub fn close_library() -> Result<(), SesamVitaleError> {
|
||||||
|
let exit_code: u16 = unsafe { SSV_TermLIB() };
|
||||||
|
if exit_code != 0 {
|
||||||
|
let error = SesamVitaleError { code: exit_code };
|
||||||
|
return Err(error);
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn read_config() -> Result<Configuration, SesamVitaleError> {
|
||||||
|
let mut buffer_ptr: *mut libc::c_void = ptr::null_mut();
|
||||||
|
let mut size: libc::size_t = 0;
|
||||||
|
|
||||||
|
let buffer_ptr_ptr: *mut *mut libc::c_void = &mut buffer_ptr;
|
||||||
|
let size_ptr: *mut libc::size_t = &mut size;
|
||||||
|
|
||||||
|
// Need to add proper error handling -> return a result with error code pointing to an error
|
||||||
|
// enum
|
||||||
|
let exit_code: u16 = unsafe { SSV_LireConfig(buffer_ptr_ptr, size_ptr) };
|
||||||
|
|
||||||
|
if exit_code != 0 {
|
||||||
|
let error = SesamVitaleError { code: exit_code };
|
||||||
|
return Err(error);
|
||||||
|
};
|
||||||
|
|
||||||
|
let buffer: &[u8] = unsafe { std::slice::from_raw_parts(buffer_ptr as *const u8, size) };
|
||||||
|
|
||||||
|
// TODO: Improve error handling
|
||||||
|
let configuration: Configuration = read_from_buffer(buffer).unwrap();
|
||||||
|
|
||||||
|
// TODO: Call library function for memory delocating
|
||||||
|
unsafe { libc::free(buffer_ptr) };
|
||||||
|
|
||||||
|
Ok(configuration)
|
||||||
|
}
|
||||||
288
crates/services-sesam-vitale-sys/src/bindings.rs
Normal file
288
crates/services-sesam-vitale-sys/src/bindings.rs
Normal file
@ -0,0 +1,288 @@
|
|||||||
|
#![allow(non_upper_case_globals)]
|
||||||
|
#![allow(non_camel_case_types)]
|
||||||
|
#![allow(non_snake_case)]
|
||||||
|
#![allow(dead_code)]
|
||||||
|
|
||||||
|
// Generated using bindgen
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
// Fonctions de gestion des données
|
||||||
|
|
||||||
|
pub fn SSV_LireCartePS(
|
||||||
|
NomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
CodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_LireDroitsVitale(
|
||||||
|
NomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
CodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
DateConsultation: *const ::std::os::raw::c_char,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_FormaterFactures(
|
||||||
|
cFactureACreer: ::std::os::raw::c_char,
|
||||||
|
cModeSecur: ::std::os::raw::c_char,
|
||||||
|
cTypeFlux: ::std::os::raw::c_char,
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
TailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_ChiffrerFacture(
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
TailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_SignerFactureVitale(
|
||||||
|
pcNomRessourceVitale: *const ::std::os::raw::c_char,
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
szTailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pszTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_CalculerHashFactureAssure(
|
||||||
|
pcNumSerie: *const ::std::os::raw::c_char,
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
szTailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pszTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_AjouterSignatureAssureDansFacture(
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
szTailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pszTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_SignerFactureCPS(
|
||||||
|
pcNomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
pcCodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
cNologSituation: ::std::os::raw::c_char,
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
szTailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pszTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_FormaterLot(
|
||||||
|
NBZDataIn: ::std::os::raw::c_short,
|
||||||
|
TZDataIn: *mut *mut ::std::os::raw::c_void,
|
||||||
|
TTailleZoneIn: *mut usize,
|
||||||
|
pNbZDataOut: *mut ::std::os::raw::c_short,
|
||||||
|
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
TTailleZoneOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_SignerLotCPS(
|
||||||
|
pcNomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
pcCodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
cNologSituation: ::std::os::raw::c_char,
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
szTailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pszTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_FormaterFichier(
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
TailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_TraduireARL(
|
||||||
|
NbZDonneesEntree: ::std::os::raw::c_short,
|
||||||
|
TZDataIn: *mut *mut ::std::os::raw::c_void,
|
||||||
|
TTailleZoneIn: *mut usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pTailleZoneOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_LireNumSerieCarteVitale(
|
||||||
|
pcNomRessource: *mut ::std::os::raw::c_char,
|
||||||
|
numeroSerie: *mut ::std::os::raw::c_uchar,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_CalculerHashFacturePS(
|
||||||
|
pcNumSerieCPS: *const ::std::os::raw::c_char,
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
usTailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pusTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_AjouterSignaturePSFacture(
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
szTailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pszTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_DechargerFacturesPdT(
|
||||||
|
NomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
CodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
pcNumFact: *const ::std::os::raw::c_char,
|
||||||
|
sNbZDataIn: ::std::os::raw::c_short,
|
||||||
|
pvTZDataIn: *mut *mut ::std::os::raw::c_void,
|
||||||
|
psTTailleDataIn: *mut usize,
|
||||||
|
pNbZDataOut: *mut ::std::os::raw::c_short,
|
||||||
|
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
TTailleZoneOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_TraduireFSE(
|
||||||
|
pZDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
TailleDataIn: usize,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pTailleZone: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
// Fonctions TLA
|
||||||
|
// TLA (Terminal Lecteur Applicatif) -> lecteur autre que PC-SC, on ne prend pas en compte cela
|
||||||
|
|
||||||
|
pub fn SSV_IdentifierTLA(
|
||||||
|
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
NumVersionCDC: *const ::std::os::raw::c_char,
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
tailleDataOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_ChargerDonneesTLA(
|
||||||
|
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
sNbZDataIn: ::std::os::raw::c_short,
|
||||||
|
pvTZDataIn: *mut *mut ::std::os::raw::c_void,
|
||||||
|
psTTailleDataIn: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_ChargerFacturesPdT(
|
||||||
|
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
pcNumFacturation: *const ::std::os::raw::c_char,
|
||||||
|
sNbZDataIn: ::std::os::raw::c_short,
|
||||||
|
pvTZDataIn: *mut *mut ::std::os::raw::c_void,
|
||||||
|
psTTailleDataIn: *mut usize,
|
||||||
|
pNbZDataOut: *mut ::std::os::raw::c_short,
|
||||||
|
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
TTailleZoneOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_DechargerFSETLA(
|
||||||
|
NomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
CodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
pcNumFact: *const ::std::os::raw::c_char,
|
||||||
|
pNbZDataOut: *mut ::std::os::raw::c_short,
|
||||||
|
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
TTailleZoneOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_DechargerFSETLANC(
|
||||||
|
NomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
CodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
pcNumFact: *const ::std::os::raw::c_char,
|
||||||
|
pNbZDataOut: *mut ::std::os::raw::c_short,
|
||||||
|
TZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
TTailleZoneOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_DechargerBeneficiaires(
|
||||||
|
NomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
CodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
cNumFacturation: *const ::std::os::raw::c_char,
|
||||||
|
sNbZDataOut: *mut ::std::os::raw::c_short,
|
||||||
|
pTZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
sTTailleDataOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_EffacerTLA(
|
||||||
|
NomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
NomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
CodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
cNumFacturation: *const ::std::os::raw::c_char,
|
||||||
|
cTypeDonnee: *const ::std::os::raw::c_char,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
pub fn SSV_SecuriserFacture(
|
||||||
|
pcNomRessourcePS: *const ::std::os::raw::c_char,
|
||||||
|
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
pcCodePorteurPS: *const ::std::os::raw::c_char,
|
||||||
|
cNologSituation: ::std::os::raw::c_char,
|
||||||
|
pcNumFact: *const ::std::os::raw::c_char,
|
||||||
|
pvDataIn: *mut ::std::os::raw::c_void,
|
||||||
|
szTailleDataIn: usize,
|
||||||
|
pvDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
pszTailleDataOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
// Fonctions de gestion de configuration (GALSS)
|
||||||
|
|
||||||
|
pub fn SSV_LireConfig(
|
||||||
|
pZDataOut: *mut *mut ::std::os::raw::c_void,
|
||||||
|
psTailleDataOut: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_LireDateLecteur(
|
||||||
|
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
pcDateHeure: *mut ::std::os::raw::c_char,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_MajDateLecteur(
|
||||||
|
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
pcDateHeure: *const ::std::os::raw::c_char,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
pub fn SSV_ChargerAppli(
|
||||||
|
pcNomRessourceLecteur: *const ::std::os::raw::c_char,
|
||||||
|
sNbZDataIn: ::std::os::raw::c_short,
|
||||||
|
pvTZDataIn: *mut *mut ::std::os::raw::c_void,
|
||||||
|
psTTailleDataIn: *mut usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
// Fonctions techniques
|
||||||
|
|
||||||
|
// La fonction Initialiser Librairie a pour objet de charger et d’initialiser dans la mémoire du système :
|
||||||
|
// - dans le cas où le GALSS est installé sur le poste :
|
||||||
|
// - la bibliothèque du Gestionnaire d’Accès au Lecteur Santé Social (GALSS),
|
||||||
|
// - qui charge la bibliothèque du Protocole Santé Social (PSS),
|
||||||
|
// - la configuration du poste de travail à l’aide du fichier galssinf,
|
||||||
|
// - les variables globales communes aux différents Services SESAM-Vitale,
|
||||||
|
// - les fichiers de tables et scripts des répertoires par défaut.
|
||||||
|
// Cette fonction accède au référentiel électronique en utilisant le chemin complet indiqué dans le fichier sesam.ini.
|
||||||
|
pub fn SSV_InitLIB2(pcFichierSesam: *const ::std::os::raw::c_char) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
// La fonction Terminer a pour objet de décharger de la mémoire du système les éléments
|
||||||
|
// chargés par la fonction Initialiser Librairie, qui ne sont plus utiles.
|
||||||
|
pub fn SSV_TermLIB() -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
/// Fonctions de Tracage
|
||||||
|
//La fonction Allouer Zone Mémoire a un rôle purement technique : elle permet d’allouer, autrement dit de réserver une zone ou partie de la mémoire du poste de travail pour y écrire les données à passer en entrée d’un Service SESAM-Vitale.
|
||||||
|
// Cette fonction doit être utilisée pour allouer toutes les zones de mémoire requises en entrée des Services SESAM-Vitale de manière à permettre un diagnostic fiable par le « mode trace » en cas de dysfonctionnement. En effet, son mode d’exécution est susceptible de fournir des informations utiles au « mode trace » lorsqu’il est activé.
|
||||||
|
pub fn SSV_AllouerZoneMem(
|
||||||
|
pZDataIn: *mut *mut ::std::os::raw::c_void,
|
||||||
|
taille: usize,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
// La fonction Libérer Zone Mémoire a un rôle purement technique : elle permet de libérer une zone de mémoire du poste de travail précédemment allouée après exploitation des données qu’elle contient.
|
||||||
|
// Cette fonction doit être utilisée pour libérer toutes les zones de mémoire :
|
||||||
|
// - celles qui ont été allouées par le progiciel de santé pour fournir les données nécessaires à l’entrée des Services SESAM-Vitale, avant leur appel, celles qui ont été allouées par les Services SESAM-Vitale pour fournir en sortie les données utiles au progiciel de santé qui a fait appel à ces services,
|
||||||
|
// - de façon à permettre un diagnostic fiable par le mode trace en cas de dysfonctionnement
|
||||||
|
//En effet, son exécution est susceptible de fournir des informations utiles au « mode trace » lorsqu’il est activé.
|
||||||
|
pub fn SSV_LibererZoneMem(pZone: *mut ::std::os::raw::c_void);
|
||||||
|
|
||||||
|
// La fonction Initialiser Trace a pour objet de permettre l’activation du « mode trace ».
|
||||||
|
// Ce mode de fonctionnement est prévu pour permettre à l’assistance technique du GIE
|
||||||
|
// SESAM-Vitale d’analyser les problèmes de mise en œuvre des Services SESAM-Vitale,
|
||||||
|
// notamment lorsque une fonction retourne un code d’erreur de valeur hexadécimale supérieure à FF00.
|
||||||
|
pub fn SSV_InitTrace(
|
||||||
|
pathConf: *mut ::std::os::raw::c_char,
|
||||||
|
ModeOuvertureFicherLog: *mut ::std::os::raw::c_char,
|
||||||
|
ModuleLog: ::std::os::raw::c_ushort,
|
||||||
|
NiveauLog: ::std::os::raw::c_uchar,
|
||||||
|
) -> ::std::os::raw::c_ushort;
|
||||||
|
|
||||||
|
}
|
||||||
6
crates/services-sesam-vitale-sys/src/lib.rs
Normal file
6
crates/services-sesam-vitale-sys/src/lib.rs
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
pub mod api;
|
||||||
|
mod bindings;
|
||||||
|
pub mod types;
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {}
|
||||||
144
crates/services-sesam-vitale-sys/src/types/common.rs
Normal file
144
crates/services-sesam-vitale-sys/src/types/common.rs
Normal file
@ -0,0 +1,144 @@
|
|||||||
|
use crate::types::configuration::{
|
||||||
|
ConfigurationHeader, PCSCReader, ReaderConfiguration, SESAMVitaleComponent,
|
||||||
|
};
|
||||||
|
|
||||||
|
use std::{error::Error, str::FromStr};
|
||||||
|
|
||||||
|
use bitvec::index::BitIdx;
|
||||||
|
use deku::{
|
||||||
|
bitvec::{BitStore, Msb0},
|
||||||
|
ctx::ByteSize,
|
||||||
|
deku_derive,
|
||||||
|
reader::{Reader, ReaderRet},
|
||||||
|
DekuContainerRead, DekuError, DekuReader,
|
||||||
|
};
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
pub(crate) struct NumericString(#[deku(map = "convert_from_data_field")] String);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
pub(crate) struct AlphaNumericString(#[deku(map = "convert_from_data_field")] String);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
pub(crate) struct BinaryData(#[deku(map = "extract_from_data_field")] Vec<u8>);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq)]
|
||||||
|
#[deku(endian = "big")]
|
||||||
|
pub(crate) struct GroupId(u16);
|
||||||
|
|
||||||
|
trait MapToDekuParseError<T> {
|
||||||
|
fn map_to_deku_parse_error(self) -> Result<T, DekuError>;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T, E: Error> MapToDekuParseError<T> for Result<T, E> {
|
||||||
|
fn map_to_deku_parse_error(self) -> Result<T, DekuError> {
|
||||||
|
self.map_err(|e| DekuError::Parse(e.to_string().into()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_size<R: std::io::Read>(reader: &mut Reader<R>) -> Result<ByteSize, DekuError> {
|
||||||
|
let first_byte: u8 = u8::from_reader_with_ctx(reader, ())?;
|
||||||
|
|
||||||
|
let is_length_expanded = first_byte.get_bit::<Msb0>(BitIdx::new(0).map_to_deku_parse_error()?);
|
||||||
|
|
||||||
|
match is_length_expanded {
|
||||||
|
true => {
|
||||||
|
let size_of_data_size: ByteSize = ByteSize((first_byte & 0b0111_1111) as usize);
|
||||||
|
|
||||||
|
if size_of_data_size.0 > 4 {
|
||||||
|
return Err(DekuError::Parse("Size of the length encoding is > 4, this is not normal. Probable parsing error".to_string().into()));
|
||||||
|
};
|
||||||
|
|
||||||
|
// maximum size of the buffer is 4, we use the offset to read values less than 4 bytes
|
||||||
|
let buffer: &mut [u8; 4] = &mut [0; 4];
|
||||||
|
let write_offset = 4 - size_of_data_size.0;
|
||||||
|
|
||||||
|
match reader.read_bytes(size_of_data_size.0, &mut buffer[write_offset..])? {
|
||||||
|
ReaderRet::Bits(_bit_vec) => Err(DekuError::Parse("Got bits when trying to read bytes -> reader is unaligned, this is not normal.".to_string().into())),
|
||||||
|
ReaderRet::Bytes => Ok(ByteSize(u32::from_be_bytes(*buffer) as usize)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
false => Ok(ByteSize(first_byte as usize)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Using this as the map function asks deku to parse a datafield
|
||||||
|
// We then use the datafield and convert it to the corresponding value
|
||||||
|
pub(super) fn convert_from_data_field<T>(data_field: DataField) -> Result<T, DekuError>
|
||||||
|
where
|
||||||
|
T: FromStr,
|
||||||
|
T::Err: Error,
|
||||||
|
{
|
||||||
|
let text = String::from_utf8(data_field.data).map_to_deku_parse_error()?;
|
||||||
|
T::from_str(&text).map_to_deku_parse_error()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn extract_from_data_field(data_field: DataField) -> Result<Vec<u8>, DekuError> {
|
||||||
|
Ok(data_field.data)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub(crate) struct DataField {
|
||||||
|
#[deku(reader = "read_size(deku::reader)")]
|
||||||
|
pub(crate) data_size: ByteSize,
|
||||||
|
|
||||||
|
#[deku(bytes_read = "data_size.0")]
|
||||||
|
pub(crate) data: Vec<u8>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub(crate) struct BlockHeader {
|
||||||
|
pub(crate) group_id: GroupId,
|
||||||
|
|
||||||
|
#[deku(reader = "read_size(deku::reader)")]
|
||||||
|
pub(crate) data_size: ByteSize,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub(crate) struct DataBlock {
|
||||||
|
pub(crate) header: BlockHeader,
|
||||||
|
|
||||||
|
#[deku(ctx = "header.group_id")]
|
||||||
|
pub(crate) inner: DataGroup,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
#[deku(ctx = "group_id: GroupId", id = "group_id.0")]
|
||||||
|
pub enum DataGroup {
|
||||||
|
#[deku(id = 60)]
|
||||||
|
ConfigurationHeader(ConfigurationHeader),
|
||||||
|
#[deku(id = 61)]
|
||||||
|
ReaderConfiguration(ReaderConfiguration),
|
||||||
|
#[deku(id = 64)]
|
||||||
|
SESAMVitaleComponent(SESAMVitaleComponent),
|
||||||
|
#[deku(id = 67)]
|
||||||
|
PCSCReader(PCSCReader),
|
||||||
|
}
|
||||||
|
pub(crate) fn read_from_buffer<T>(buffer: &[u8]) -> Result<T, T::Error>
|
||||||
|
where
|
||||||
|
T: TryFrom<Vec<DataBlock>>,
|
||||||
|
{
|
||||||
|
let mut data_blocks: Vec<DataBlock> = Vec::new();
|
||||||
|
let mut offset = 0;
|
||||||
|
|
||||||
|
let mut remaining_buffer = buffer;
|
||||||
|
|
||||||
|
while !remaining_buffer.is_empty() {
|
||||||
|
// TODO: properly handle errors
|
||||||
|
let (rest, data_block) = DataBlock::from_bytes((remaining_buffer, offset)).unwrap();
|
||||||
|
|
||||||
|
data_blocks.push(data_block);
|
||||||
|
|
||||||
|
(remaining_buffer, offset) = rest;
|
||||||
|
}
|
||||||
|
|
||||||
|
T::try_from(data_blocks)
|
||||||
|
}
|
||||||
137
crates/services-sesam-vitale-sys/src/types/configuration.rs
Normal file
137
crates/services-sesam-vitale-sys/src/types/configuration.rs
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
use crate::types::common::DataBlock;
|
||||||
|
use std::{error::Error, fmt, vec::Vec};
|
||||||
|
|
||||||
|
use crate::types::common::convert_from_data_field;
|
||||||
|
use deku::{deku_derive, DekuReader};
|
||||||
|
|
||||||
|
use super::common::{AlphaNumericString, DataGroup};
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct SSVVersionNumber(#[deku(map = "convert_from_data_field")] u16);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct GALSSVersionNumber(#[deku(map = "convert_from_data_field")] u16);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct PSSVersionNumber(#[deku(map = "convert_from_data_field")] u16);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct ConfigurationHeader {
|
||||||
|
pub ssv_version: SSVVersionNumber,
|
||||||
|
pub galss_version: GALSSVersionNumber,
|
||||||
|
pub pss_version: PSSVersionNumber,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct PCSCReaderName(AlphaNumericString);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct CardType(#[deku(map = "convert_from_data_field")] u8);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct PCSCReader {
|
||||||
|
pub name: PCSCReaderName,
|
||||||
|
pub card_type: CardType,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct SESAMVitaleComponentID(#[deku(map = "convert_from_data_field")] u16);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct SESAMVitaleComponentDescription(AlphaNumericString);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct SESAMVitaleComponentVersion(AlphaNumericString);
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct SESAMVitaleComponent {
|
||||||
|
pub id: SESAMVitaleComponentID,
|
||||||
|
pub description: SESAMVitaleComponentDescription,
|
||||||
|
pub version: SESAMVitaleComponentVersion,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[deku_derive(DekuRead)]
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct ReaderConfiguration {}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum ConfigurationError {
|
||||||
|
MultipleConfigurationHeaders,
|
||||||
|
MissingConfigurationHeader,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for ConfigurationError {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
ConfigurationError::MultipleConfigurationHeaders => {
|
||||||
|
write!(f, "Multiple ConfigurationHeader blocks found")
|
||||||
|
}
|
||||||
|
ConfigurationError::MissingConfigurationHeader => {
|
||||||
|
write!(f, "Missing ConfigurationHeader block")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Error for ConfigurationError {}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct Configuration {
|
||||||
|
pub configuration_header: ConfigurationHeader,
|
||||||
|
pub reader_configurations: Vec<ReaderConfiguration>,
|
||||||
|
pub sesam_vitale_components: Vec<SESAMVitaleComponent>,
|
||||||
|
pub pcsc_readers: Vec<PCSCReader>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TryFrom<Vec<DataBlock>> for Configuration {
|
||||||
|
type Error = ConfigurationError;
|
||||||
|
|
||||||
|
fn try_from(data_blocks: Vec<DataBlock>) -> Result<Self, Self::Error> {
|
||||||
|
let mut configuration_header: Option<ConfigurationHeader> = None;
|
||||||
|
let mut reader_configurations: Vec<ReaderConfiguration> = Vec::new();
|
||||||
|
let mut sesam_vitale_components: Vec<SESAMVitaleComponent> = Vec::new();
|
||||||
|
let mut pcsc_readers: Vec<PCSCReader> = Vec::new();
|
||||||
|
|
||||||
|
for block in data_blocks {
|
||||||
|
match block.inner {
|
||||||
|
DataGroup::ConfigurationHeader(header) => {
|
||||||
|
if configuration_header.is_some() {
|
||||||
|
return Err(ConfigurationError::MultipleConfigurationHeaders);
|
||||||
|
}
|
||||||
|
configuration_header = Some(header);
|
||||||
|
}
|
||||||
|
DataGroup::ReaderConfiguration(configuration) => {
|
||||||
|
reader_configurations.push(configuration)
|
||||||
|
}
|
||||||
|
DataGroup::SESAMVitaleComponent(component) => {
|
||||||
|
sesam_vitale_components.push(component);
|
||||||
|
}
|
||||||
|
DataGroup::PCSCReader(reader) => {
|
||||||
|
pcsc_readers.push(reader);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let configuration_header = match configuration_header {
|
||||||
|
Some(header) => header,
|
||||||
|
None => return Err(ConfigurationError::MissingConfigurationHeader),
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
configuration_header,
|
||||||
|
reader_configurations,
|
||||||
|
sesam_vitale_components,
|
||||||
|
pcsc_readers,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
3
crates/services-sesam-vitale-sys/src/types/mod.rs
Normal file
3
crates/services-sesam-vitale-sys/src/types/mod.rs
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
pub mod common;
|
||||||
|
pub mod configuration;
|
||||||
|
// pub mod droits_vitale;
|
||||||
@ -4,11 +4,10 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow.workspace = true
|
anyhow = "1.0"
|
||||||
libc = "0.2"
|
libc = "0.2"
|
||||||
thiserror.workspace = true
|
thiserror = "1.0"
|
||||||
|
|
||||||
utils = { path = "../utils" }
|
utils = { path = "../utils" }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
dotenv.workspace = true
|
dotenv = "0.15"
|
||||||
|
|||||||
@ -9,7 +9,7 @@ use thiserror::Error;
|
|||||||
use crate::cps::lire_carte;
|
use crate::cps::lire_carte;
|
||||||
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
|
use crate::libssv::{SSV_InitLIB2, SSV_LireConfig};
|
||||||
|
|
||||||
use ::utils::config::{load_config, ConfigError};
|
use ::utils::config::load_config;
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
pub enum SSVDemoError {
|
pub enum SSVDemoError {
|
||||||
@ -18,7 +18,7 @@ pub enum SSVDemoError {
|
|||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
SSVLibErrorCode(#[from] crate::libssv::LibSSVError),
|
SSVLibErrorCode(#[from] crate::libssv::LibSSVError),
|
||||||
#[error(transparent)]
|
#[error(transparent)]
|
||||||
Configuration(#[from] ConfigError),
|
Anyhow(#[from] anyhow::Error),
|
||||||
}
|
}
|
||||||
|
|
||||||
fn ssv_init_lib_2() -> Result<(), SSVDemoError> {
|
fn ssv_init_lib_2() -> Result<(), SSVDemoError> {
|
||||||
@ -71,7 +71,7 @@ pub fn demo() -> Result<(), SSVDemoError> {
|
|||||||
|
|
||||||
println!("------- Demo for the SSV library --------");
|
println!("------- Demo for the SSV library --------");
|
||||||
|
|
||||||
load_config(None)?;
|
load_config()?;
|
||||||
|
|
||||||
ssv_init_lib_2()?;
|
ssv_init_lib_2()?;
|
||||||
|
|
||||||
|
|||||||
@ -4,7 +4,6 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow.workspace = true
|
anyhow = "1.0"
|
||||||
directories = "5.0"
|
directories = "5.0"
|
||||||
dotenv.workspace = true
|
dotenv = "0.15"
|
||||||
thiserror.workspace = true
|
|
||||||
|
|||||||
@ -1,23 +1,11 @@
|
|||||||
use std::{env, path::PathBuf, sync::atomic::AtomicBool};
|
use std::{env, path::PathBuf};
|
||||||
|
|
||||||
|
use anyhow::{bail, Context, Result};
|
||||||
use directories::ProjectDirs;
|
use directories::ProjectDirs;
|
||||||
use dotenv::from_path;
|
use dotenv::from_path;
|
||||||
use thiserror::Error;
|
|
||||||
|
|
||||||
const CONFIG_FILE_NAME: &str = ".env";
|
const CONFIG_FILE_NAME: &str = ".env";
|
||||||
|
|
||||||
static CONFIG_INITIALIZED: AtomicBool = AtomicBool::new(false);
|
|
||||||
|
|
||||||
#[derive(Debug, Error)]
|
|
||||||
pub enum ConfigError {
|
|
||||||
#[error("No config file {0} found in the following directories: {1:#?}")]
|
|
||||||
ConfigFileNotFound(String, Vec<PathBuf>),
|
|
||||||
#[error("Failed to load config file: {0}")]
|
|
||||||
LoadConfigError(#[from] dotenv::Error),
|
|
||||||
#[error("Environment variable error: {0}")]
|
|
||||||
EnvVarError(#[from] std::env::VarError),
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_config_dirs() -> Vec<PathBuf> {
|
pub fn get_config_dirs() -> Vec<PathBuf> {
|
||||||
let mut config_dirs = vec![
|
let mut config_dirs = vec![
|
||||||
PathBuf::from(""), // Current directory
|
PathBuf::from(""), // Current directory
|
||||||
@ -31,7 +19,7 @@ pub fn get_config_dirs() -> Vec<PathBuf> {
|
|||||||
config_dirs
|
config_dirs
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_config_files() -> Result<Vec<PathBuf>, ConfigError> {
|
pub fn get_config_files() -> Result<Vec<PathBuf>> {
|
||||||
let config_dirs = get_config_dirs();
|
let config_dirs = get_config_dirs();
|
||||||
let mut config_files = Vec::new();
|
let mut config_files = Vec::new();
|
||||||
for config_dir in config_dirs.iter() {
|
for config_dir in config_dirs.iter() {
|
||||||
@ -41,20 +29,14 @@ pub fn get_config_files() -> Result<Vec<PathBuf>, ConfigError> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if config_files.is_empty() {
|
if config_files.is_empty() {
|
||||||
return Err(ConfigError::ConfigFileNotFound(
|
bail!(
|
||||||
CONFIG_FILE_NAME.to_string(),
|
"No config file {CONFIG_FILE_NAME} found in the following directories: {config_dirs:#?}"
|
||||||
config_dirs,
|
);
|
||||||
));
|
|
||||||
}
|
}
|
||||||
Ok(config_files)
|
Ok(config_files)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn load_config(force: Option<bool>) -> Result<(), ConfigError> {
|
pub fn load_config() -> Result<()> {
|
||||||
let force = force.unwrap_or(false);
|
|
||||||
if CONFIG_INITIALIZED.load(std::sync::atomic::Ordering::Relaxed) && force {
|
|
||||||
println!("DEBUG: Config already initialized, skipping");
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
let config_files = get_config_files()?;
|
let config_files = get_config_files()?;
|
||||||
// Load the first config file found
|
// Load the first config file found
|
||||||
// TODO: add a verbose log to list all config files found
|
// TODO: add a verbose log to list all config files found
|
||||||
@ -62,7 +44,5 @@ pub fn load_config(force: Option<bool>) -> Result<(), ConfigError> {
|
|||||||
"DEBUG: Config files found (1st loaded): {:#?}",
|
"DEBUG: Config files found (1st loaded): {:#?}",
|
||||||
config_files
|
config_files
|
||||||
);
|
);
|
||||||
from_path(config_files[0].as_path()).map_err(ConfigError::LoadConfigError)?;
|
from_path(config_files[0].as_path()).context("Failed to load config file")
|
||||||
CONFIG_INITIALIZED.store(true, std::sync::atomic::Ordering::Relaxed);
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,15 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "entity"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "entity"
|
|
||||||
path = "src/lib.rs"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
sea-orm.workspace = true
|
|
||||||
serde.workspace = true
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
sea-orm-cli.workspace = true
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.1
|
|
||||||
|
|
||||||
use sea_orm::entity::prelude::*;
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
|
|
||||||
#[sea_orm(table_name = "debug")]
|
|
||||||
pub struct Model {
|
|
||||||
#[sea_orm(primary_key)]
|
|
||||||
pub id: i32,
|
|
||||||
pub title: String,
|
|
||||||
pub text: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
|
||||||
pub enum Relation {}
|
|
||||||
|
|
||||||
impl ActiveModelBehavior for ActiveModel {}
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.1
|
|
||||||
|
|
||||||
pub mod prelude;
|
|
||||||
|
|
||||||
pub mod debug;
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
//! `SeaORM` Entity, @generated by sea-orm-codegen 1.0.1
|
|
||||||
|
|
||||||
pub use super::debug::Entity as Debug;
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
mod entities;
|
|
||||||
pub use entities::*;
|
|
||||||
@ -1,6 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<NuxtLoadingIndicator />
|
|
||||||
<NuxtRouteAnnouncer />
|
<NuxtRouteAnnouncer />
|
||||||
<NavBar />
|
<NavBar />
|
||||||
<NuxtPage />
|
<NuxtPage />
|
||||||
|
|||||||
@ -17,6 +17,6 @@
|
|||||||
if (user.avatar) {
|
if (user.avatar) {
|
||||||
return user.avatar;
|
return user.avatar;
|
||||||
}
|
}
|
||||||
return 'https://i.pravatar.cc/150?u=' + user.name;
|
return 'https://avatar.iran.liara.run/username?username=' + user.name;
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -29,15 +29,15 @@
|
|||||||
|
|
||||||
const users: User[] = [
|
const users: User[] = [
|
||||||
{ id: 1, name: 'John Doe', avatar: 'https://img.daisyui.com/images/stock/photo-1534528741775-53994a69daeb.webp' },
|
{ id: 1, name: 'John Doe', avatar: 'https://img.daisyui.com/images/stock/photo-1534528741775-53994a69daeb.webp' },
|
||||||
{ id: 2, name: 'Jane Doe', avatar: 'https://i.pravatar.cc/150?u=JANEDOE728' },
|
{ id: 2, name: 'Jane Doe', avatar: 'https://avatar.iran.liara.run/public' },
|
||||||
{ id: 3, name: 'Michel Moulin' },
|
{ id: 3, name: 'Michel Moulin', avatar: '' },
|
||||||
{ id: 4, name: 'Jean Paris' },
|
{ id: 4, name: 'Jean Paris', avatar: '' },
|
||||||
{ id: 5, name: 'Marie Dupont' },
|
{ id: 5, name: 'Marie Dupont', avatar: '' },
|
||||||
{ id: 6, name: 'Émilie Fournier' },
|
{ id: 6, name: 'Émilie Fournier', avatar: '' },
|
||||||
{ id: 7, name: 'Pierre Lefevre' },
|
{ id: 7, name: 'Pierre Lefevre', avatar: '' },
|
||||||
{ id: 8, name: 'Sophie Lemoine' },
|
{ id: 8, name: 'Sophie Lemoine', avatar: '' },
|
||||||
{ id: 9, name: 'Lucie Simon' },
|
{ id: 9, name: 'Lucie Simon', avatar: '' },
|
||||||
{ id: 10, name: 'Kevin Boucher' },
|
{ id: 10, name: 'Kevin Boucher', avatar: '' },
|
||||||
];
|
];
|
||||||
|
|
||||||
const loginModal = useTemplateRef('login_modal');
|
const loginModal = useTemplateRef('login_modal');
|
||||||
|
|||||||
@ -6,7 +6,6 @@
|
|||||||
<nav class="navbar-center">
|
<nav class="navbar-center">
|
||||||
<NuxtLink to="/" class="btn btn-ghost">Accueil</NuxtLink>
|
<NuxtLink to="/" class="btn btn-ghost">Accueil</NuxtLink>
|
||||||
<NuxtLink to="/CPS" class="btn btn-ghost">Carte CPS</NuxtLink>
|
<NuxtLink to="/CPS" class="btn btn-ghost">Carte CPS</NuxtLink>
|
||||||
<NuxtLink to="/debug" class="btn btn-ghost">Debug</NuxtLink>
|
|
||||||
</nav>
|
</nav>
|
||||||
<div class="navbar-end">
|
<div class="navbar-end">
|
||||||
<template v-if="!current_user">
|
<template v-if="!current_user">
|
||||||
|
|||||||
@ -1,67 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div>
|
|
||||||
<h1 class="text-3xl mb-8">Debug</h1>
|
|
||||||
<div class="stats shadow mb-8">
|
|
||||||
<div class="stat">
|
|
||||||
<div class="stat-title">DB Ping Status</div>
|
|
||||||
<div class="stat-value">{{ data?.db_ping_status || "?" }}</div>
|
|
||||||
</div>
|
|
||||||
<div class="stat">
|
|
||||||
<div class="stat-title">Entries Count</div>
|
|
||||||
<div class="stat-value">{{ data?.entries.length || "?" }}</div>
|
|
||||||
<div class="stat-actions">
|
|
||||||
<button class="btn btn-sm" @click="addRandomEntry">Add entry</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="stat">
|
|
||||||
<div class="stat-title">Network status</div>
|
|
||||||
<div class="stat-value">{{ status }}</div>
|
|
||||||
<div class="stat-description">{{ error }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h2 class="text-2xl mb-4">Entries</h2>
|
|
||||||
<table class="table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Id</th>
|
|
||||||
<th>Title</th>
|
|
||||||
<th>Text</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr v-for="entry in data?.entries" :key="entry.id">
|
|
||||||
<td>{{ entry.id }}</td>
|
|
||||||
<td>{{ entry.title }}</td>
|
|
||||||
<td>{{ entry.text }}</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
type Entry = {
|
|
||||||
id: number;
|
|
||||||
title: string;
|
|
||||||
text: string;
|
|
||||||
};
|
|
||||||
type DebugResponse = {
|
|
||||||
db_ping_status: string;
|
|
||||||
entries: Entry[];
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// TODO : handle a default backend URL by building a custom `$fetch` and `useFetch` functions with a `baseURL` option : https://nuxt.com/docs/guide/recipes/custom-usefetch#custom-fetch
|
|
||||||
|
|
||||||
const { data, refresh, error, status } = await useFetch<DebugResponse>('http://127.0.0.1:8080/debug');
|
|
||||||
|
|
||||||
async function addRandomEntry() {
|
|
||||||
await $fetch('http://127.0.0.1:8080/debug/add_random', {
|
|
||||||
method: 'POST',
|
|
||||||
});
|
|
||||||
refresh();
|
|
||||||
}
|
|
||||||
|
|
||||||
</script>
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "migration"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2021"
|
|
||||||
publish = false
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "migration"
|
|
||||||
path = "src/lib.rs"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
async-std = { version = "1", features = ["attributes", "tokio1"] }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
sea-orm-cli.workspace = true
|
|
||||||
|
|
||||||
[dependencies.sea-orm-migration]
|
|
||||||
version = "1.0.0"
|
|
||||||
features = [
|
|
||||||
# `ASYNC_RUNTIME` and `DATABASE_DRIVER` are required to run migration using the cli
|
|
||||||
# They must be the same as the features in the `sea-orm` dependency in the `app` crate
|
|
||||||
"sqlx-sqlite", # `DATABASE_DRIVER` feature
|
|
||||||
"runtime-tokio-rustls", # `ASYNC_RUNTIME` feature
|
|
||||||
]
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
# Running Migrator CLI
|
|
||||||
|
|
||||||
- Generate a new migration file
|
|
||||||
```sh
|
|
||||||
cargo run -- generate MIGRATION_NAME
|
|
||||||
```
|
|
||||||
- Apply all pending migrations
|
|
||||||
```sh
|
|
||||||
cargo run
|
|
||||||
```
|
|
||||||
```sh
|
|
||||||
cargo run -- up
|
|
||||||
```
|
|
||||||
- Apply first 10 pending migrations
|
|
||||||
```sh
|
|
||||||
cargo run -- up -n 10
|
|
||||||
```
|
|
||||||
- Rollback last applied migrations
|
|
||||||
```sh
|
|
||||||
cargo run -- down
|
|
||||||
```
|
|
||||||
- Rollback last 10 applied migrations
|
|
||||||
```sh
|
|
||||||
cargo run -- down -n 10
|
|
||||||
```
|
|
||||||
- Drop all tables from the database, then reapply all migrations
|
|
||||||
```sh
|
|
||||||
cargo run -- fresh
|
|
||||||
```
|
|
||||||
- Rollback all applied migrations, then reapply all migrations
|
|
||||||
```sh
|
|
||||||
cargo run -- refresh
|
|
||||||
```
|
|
||||||
- Rollback all applied migrations
|
|
||||||
```sh
|
|
||||||
cargo run -- reset
|
|
||||||
```
|
|
||||||
- Check the status of all migrations
|
|
||||||
```sh
|
|
||||||
cargo run -- status
|
|
||||||
```
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
pub use sea_orm_migration::prelude::*;
|
|
||||||
|
|
||||||
mod m20220101_000001_create_debug_table;
|
|
||||||
|
|
||||||
pub struct Migrator;
|
|
||||||
|
|
||||||
#[async_trait::async_trait]
|
|
||||||
impl MigratorTrait for Migrator {
|
|
||||||
fn migrations() -> Vec<Box<dyn MigrationTrait>> {
|
|
||||||
vec![Box::new(m20220101_000001_create_debug_table::Migration)]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
use sea_orm_migration::{prelude::*, schema::*};
|
|
||||||
|
|
||||||
#[derive(DeriveMigrationName)]
|
|
||||||
pub struct Migration;
|
|
||||||
|
|
||||||
#[async_trait::async_trait]
|
|
||||||
impl MigrationTrait for Migration {
|
|
||||||
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
|
||||||
manager
|
|
||||||
.create_table(
|
|
||||||
Table::create()
|
|
||||||
.table(Debug::Table)
|
|
||||||
.if_not_exists()
|
|
||||||
.col(pk_auto(Debug::Id))
|
|
||||||
.col(string(Debug::Title))
|
|
||||||
.col(string(Debug::Text))
|
|
||||||
.to_owned(),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
|
|
||||||
manager
|
|
||||||
.drop_table(Table::drop().table(Debug::Table).to_owned())
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(DeriveIden)]
|
|
||||||
enum Debug {
|
|
||||||
Table,
|
|
||||||
Id,
|
|
||||||
Title,
|
|
||||||
Text,
|
|
||||||
}
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
use sea_orm_migration::prelude::*;
|
|
||||||
|
|
||||||
#[async_std::main]
|
|
||||||
async fn main() {
|
|
||||||
cli::run_cli(migration::Migrator).await;
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user